]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Move assignment of i_blkbits field
authorNikolay Borisov <n.borisov.lkml@gmail.com>
Fri, 29 Jul 2016 17:02:59 +0000 (20:02 +0300)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 29 Jul 2016 22:34:12 +0000 (15:34 -0700)
Currently i_blkbits is always set to SPA_MINBLOCKSHIFT every time
zfs_inode_update_impl is called. Since this value never changes
move its assignment to at inode creation time.

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4906

module/zfs/zfs_znode.c

index b43b576e88a21b22cc4196a084f1e43632855bbd..74502935c4e932cbe899182f4852f982a7b957ec 100644 (file)
@@ -535,7 +535,6 @@ zfs_inode_update_impl(znode_t *zp, boolean_t new)
        spin_lock(&ip->i_lock);
        ip->i_mode = zp->z_mode;
        zfs_set_inode_flags(zp, ip);
-       ip->i_blkbits = SPA_MINBLOCKSHIFT;
        ip->i_blocks = i_blocks;
 
        /*
@@ -634,6 +633,7 @@ zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
 
        zp->z_mode = mode;
        ip->i_generation = (uint32_t)tmp_gen;
+       ip->i_blkbits = SPA_MINBLOCKSHIFT;
        set_nlink(ip, (uint32_t)links);
        zfs_uid_write(ip, z_uid);
        zfs_gid_write(ip, z_gid);