OSDN Git Service

fs/xfs: Remove unnecessary initialization of i_rwsem
authorIra Weiny <ira.weiny@intel.com>
Thu, 23 Apr 2020 04:50:57 +0000 (21:50 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 4 May 2020 16:03:17 +0000 (09:03 -0700)
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>
fs/xfs/xfs_icache.c

index 8bf1d15..17a0b86 100644 (file)
@@ -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 {