summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorIra Weiny <ira.weiny@intel.com>2020-04-30 17:41:33 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2020-05-30 06:13:19 +0300
commitc5ec874e55ba87764357398d60e22bace0d2511d (patch)
treeb47f60aee2a55a13abeb9df39d9406d7aa983fd7 /fs/xfs
parent2c567af418e3f9380c2051aada58b4e5a4b5c2ad (diff)
downloadlinux-c5ec874e55ba87764357398d60e22bace0d2511d.tar.xz
fs/xfs: Remove unnecessary initialization of i_rwsem
An earlier call of xfs_reinit_inode() from xfs_iget_cache_hit() already handles initialization of i_rwsem. Doing so again is unneeded. Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_icache.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index d7deab608e2c..888646d74d7d 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -423,6 +423,7 @@ xfs_iget_cache_hit(
spin_unlock(&ip->i_flags_lock);
rcu_read_unlock();
+ ASSERT(!rwsem_is_locked(&inode->i_rwsem));
error = xfs_reinit_inode(mp, inode);
if (error) {
bool wake;
@@ -456,9 +457,6 @@ xfs_iget_cache_hit(
ip->i_sick = 0;
ip->i_checked = 0;
- ASSERT(!rwsem_is_locked(&inode->i_rwsem));
- init_rwsem(&inode->i_rwsem);
-
spin_unlock(&ip->i_flags_lock);
spin_unlock(&pag->pag_ici_lock);
} else {