Skip to content

Commit 640f11e

Browse files
author
Youzhong Yang
committed
Fix style errors
Indentation style check cannot mess with #ifdef Signed-off-by: Youzhong Yang <yyang@mathworks.com>
1 parent 834dd73 commit 640f11e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

module/zfs/zfs_replay.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,11 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap)
386386
lr->lr_uid, lr->lr_gid);
387387
}
388388

389-
error = zfs_create(dzp, name, &xva.xva_vattr,
390389
#if defined(__linux__)
390+
error = zfs_create(dzp, name, &xva.xva_vattr,
391391
0, 0, &zp, kcred, vflg, &vsec, kcred->user_ns);
392392
#else
393+
error = zfs_create(dzp, name, &xva.xva_vattr,
393394
0, 0, &zp, kcred, vflg, &vsec, NULL);
394395
#endif
395396
break;
@@ -420,10 +421,11 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap)
420421
(void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt,
421422
lr->lr_uid, lr->lr_gid);
422423
}
423-
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
424424
#if defined(__linux__)
425+
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
425426
&zp, kcred, vflg, &vsec, kcred->user_ns);
426427
#else
428+
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
427429
&zp, kcred, vflg, &vsec, NULL);
428430
#endif
429431
break;
@@ -535,10 +537,11 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap)
535537
if (name == NULL)
536538
name = (char *)start;
537539

538-
error = zfs_create(dzp, name, &xva.xva_vattr,
539540
#if defined(__linux__)
541+
error = zfs_create(dzp, name, &xva.xva_vattr,
540542
0, 0, &zp, kcred, vflg, NULL, kcred->user_ns);
541543
#else
544+
error = zfs_create(dzp, name, &xva.xva_vattr,
542545
0, 0, &zp, kcred, vflg, NULL, NULL);
543546
#endif
544547
break;
@@ -557,10 +560,11 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap)
557560
if (name == NULL)
558561
name = (char *)(lr + 1);
559562

560-
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
561563
#if defined(__linux__)
564+
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
562565
&zp, kcred, vflg, NULL, kcred->user_ns);
563566
#else
567+
error = zfs_mkdir(dzp, name, &xva.xva_vattr,
564568
&zp, kcred, vflg, NULL, NULL);
565569
#endif
566570

@@ -571,10 +575,11 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap)
571575
case TX_SYMLINK:
572576
name = (char *)(lr + 1);
573577
link = name + strlen(name) + 1;
574-
error = zfs_symlink(dzp, name, &xva.xva_vattr,
575578
#if defined(__linux__)
579+
error = zfs_symlink(dzp, name, &xva.xva_vattr,
576580
link, &zp, kcred, vflg, kcred->user_ns);
577581
#else
582+
error = zfs_symlink(dzp, name, &xva.xva_vattr,
578583
link, &zp, kcred, vflg, NULL);
579584
#endif
580585
break;
@@ -691,10 +696,11 @@ do_zfs_replay_rename(zfsvfs_t *zfsvfs, lr_rename_t *lr, char *sname,
691696
if (lr->lr_common.lrc_txtype & TX_CI)
692697
vflg |= FIGNORECASE;
693698

694-
error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags,
695699
#if defined(__linux__)
700+
error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags,
696701
wo_vap, kcred->user_ns);
697702
#else
703+
error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags,
698704
wo_vap, NULL);
699705
#endif
700706

module/zfs/zfs_vnops.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,11 @@ zfs_access(znode_t *zp, int mode, int flag, cred_t *cr)
168168
return (error);
169169

170170
if (flag & V_ACE_MASK)
171-
error = zfs_zaccess(zp, mode, flag, B_FALSE, cr,
172171
#if defined(__linux__)
172+
error = zfs_zaccess(zp, mode, flag, B_FALSE, cr,
173173
kcred->user_ns);
174174
#else
175+
error = zfs_zaccess(zp, mode, flag, B_FALSE, cr,
175176
NULL);
176177
#endif
177178
else

0 commit comments

Comments
 (0)