Skip to content

Commit

Permalink
zfs_inode_update should not call dmu_object_size_from_db under spinlock
Browse files Browse the repository at this point in the history
We should never block when holding a spin lock, but zfs_inode_update can
block in the critical section of a spin lock in zfs_inode_update:

zfs_inode_update -> dmu_object_size_from_db -> zrl_add -> mutex_enter

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #3858
  • Loading branch information
ryao authored and behlendorf committed Sep 30, 2015
1 parent bc8ffb2 commit 919efe9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions module/zfs/zfs_znode.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ zfs_inode_update(znode_t *zp)
zfs_sb_t *zsb;
struct inode *ip;
uint32_t blksize;
u_longlong_t i_blocks;
uint64_t atime[2], mtime[2], ctime[2];

ASSERT(zp != NULL);
Expand All @@ -499,6 +500,8 @@ zfs_inode_update(znode_t *zp)
sa_lookup(zp->z_sa_hdl, SA_ZPL_MTIME(zsb), &mtime, 16);
sa_lookup(zp->z_sa_hdl, SA_ZPL_CTIME(zsb), &ctime, 16);

dmu_object_size_from_db(sa_get_db(zp->z_sa_hdl), &blksize, &i_blocks);

spin_lock(&ip->i_lock);
ip->i_generation = zp->z_gen;
ip->i_uid = SUID_TO_KUID(zp->z_uid);
Expand All @@ -507,8 +510,7 @@ zfs_inode_update(znode_t *zp)
ip->i_mode = zp->z_mode;
zfs_set_inode_flags(zp, ip);
ip->i_blkbits = SPA_MINBLOCKSHIFT;
dmu_object_size_from_db(sa_get_db(zp->z_sa_hdl), &blksize,
(u_longlong_t *)&ip->i_blocks);
ip->i_blocks = i_blocks;

ZFS_TIME_DECODE(&ip->i_atime, atime);
ZFS_TIME_DECODE(&ip->i_mtime, mtime);
Expand Down

0 comments on commit 919efe9

Please sign in to comment.