1 files changed, 2 insertions, 16 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index cb2deb13b063..bdaf4cb9f4a2 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -874,6 +874,8 @@ xfs_fs_evict_inode(
 {
         xfs_inode_t             *ip = XFS_I(inode);
 
+        ASSERT(!rwsem_is_locked(&ip->i_iolock.mr_lock));
+
         trace_xfs_evict_inode(ip);
 
         truncate_inode_pages(&inode->i_data, 0);
@@ -882,22 +884,6 @@ xfs_fs_evict_inode(
         XFS_STATS_INC(vn_remove);
         XFS_STATS_DEC(vn_active);
 
-        /*
-         * The iolock is used by the file system to coordinate reads,
-         * writes, and block truncates.  Up to this point the lock
-         * protected concurrent accesses by users of the inode.  But
-         * from here forward we're doing some final processing of the
-         * inode because we're done with it, and although we reuse the
-         * iolock for protection it is really a distinct lock class
-         * (in the lockdep sense) from before.  To keep lockdep happy
-         * (and basically indicate what we are doing), we explicitly
-         * re-init the iolock here.
-         */
-        ASSERT(!rwsem_is_locked(&ip->i_iolock.mr_lock));
-        mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino);
-        lockdep_set_class_and_name(&ip->i_iolock.mr_lock,
-                        &xfs_iolock_reclaimable, "xfs_iolock_reclaimable");
-
         xfs_inactive(ip);
 }