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_znode.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_znode.c')
| -rw-r--r-- | module/zfs/zfs_znode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c index da9c9fe76..12dada4fc 100644 --- a/module/zfs/zfs_znode.c +++ b/module/zfs/zfs_znode.c @@ -523,7 +523,6 @@ zfs_inode_update(znode_t *zp) dmu_object_size_from_db(sa_get_db(zp->z_sa_hdl), &blksize, &i_blocks); spin_lock(&ip->i_lock); - ip->i_mode = zp->z_mode; zfs_set_inode_flags(zp, ip); ip->i_blocks = i_blocks; i_size_write(ip, zp->z_size); @@ -604,7 +603,7 @@ zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz, goto error; } - zp->z_mode = mode; + zp->z_mode = ip->i_mode = mode; ip->i_generation = (uint32_t)tmp_gen; ip->i_blkbits = SPA_MINBLOCKSHIFT; set_nlink(ip, (uint32_t)links); @@ -917,7 +916,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, } (*zpp)->z_pflags = pflags; - (*zpp)->z_mode = mode; + (*zpp)->z_mode = ZTOI(*zpp)->i_mode = mode; (*zpp)->z_dnodesize = dnodesize; if (obj_type == DMU_OT_ZNODE || @@ -1214,7 +1213,7 @@ zfs_rezget(znode_t *zp) return (SET_ERROR(EIO)); } - zp->z_mode = mode; + zp->z_mode = ZTOI(zp)->i_mode = mode; zfs_uid_write(ZTOI(zp), z_uid); zfs_gid_write(ZTOI(zp), z_gid); |