diff options
| author | lorddoskias <[email protected]> | 2016-09-28 00:08:52 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-09-27 14:08:52 -0700 |
| commit | 12fa7f3436fbd89f4d6b00c2c076405e7a21d62f (patch) | |
| tree | 123b980b9c8818a13ceabcfb874d54f8c8ef60b9 /module/zfs/zfs_vnops.c | |
| parent | df7c4059cb9ace35dfcbe37c68d27614191d0ef0 (diff) | |
Refactor inode->i_mode management
Refactor the code in such a way so that inode->i_mode is being set
at the same time zp->z_mode is being changed. This has the effect of
keeping both in sync without relying on zfs_inode_update.
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Nikolay Borisov <[email protected]>
Closes #5158
Diffstat (limited to 'module/zfs/zfs_vnops.c')
| -rw-r--r-- | module/zfs/zfs_vnops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index 796cd1e34..887b7e1dd 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -871,7 +871,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) ((zp->z_mode & S_ISUID) != 0 && uid == 0)) != 0) { uint64_t newmode; zp->z_mode &= ~(S_ISUID | S_ISGID); - newmode = zp->z_mode; + ip->i_mode = newmode = zp->z_mode; (void) sa_update(zp->z_sa_hdl, SA_ZPL_MODE(zsb), (void *)&newmode, sizeof (uint64_t), tx); } @@ -2993,7 +2993,7 @@ top: if (mask & ATTR_MODE) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zsb), NULL, &new_mode, sizeof (new_mode)); - zp->z_mode = new_mode; + zp->z_mode = ZTOI(zp)->i_mode = new_mode; ASSERT3P(aclp, !=, NULL); err = zfs_aclset_common(zp, aclp, cr, tx); ASSERT0(err); |