xfs
[Top] [All Lists]

[PATCH V2] Unlock inode before calling xfs_idestroy()

To: xfs-dev <xfs-dev@xxxxxxx>, xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH V2] Unlock inode before calling xfs_idestroy()
From: Lachlan McIlroy <lachlan@xxxxxxx>
Date: Mon, 22 Sep 2008 15:08:52 +1000
Reply-to: lachlan@xxxxxxx
User-agent: Thunderbird 2.0.0.16 (X11/20080707)
Lock debugging reported the ilock was being destroyed without being
unlocked.  We don't need to lock the inode until we are going to
insert it into the radix tree.

--- a/fs/xfs/xfs_iget.c 2008-09-22 14:55:20.000000000 +1000
+++ b/fs/xfs/xfs_iget.c 2008-09-22 13:56:33.000000000 +1000
@@ -210,9 +210,6 @@ finish_inode:

        xfs_itrace_exit_tag(ip, "xfs_iget.alloc");

-       if (lock_flags)
-               xfs_ilock(ip, lock_flags);
-
        if ((ip->i_d.di_mode == 0) && !(flags & XFS_IGET_CREATE)) {
                xfs_idestroy(ip);
                xfs_put_perag(mp, pag);
@@ -228,6 +225,10 @@ finish_inode:
                delay(1);
                goto again;
        }
+
+       if (lock_flags)
+               xfs_ilock(ip, lock_flags);
+
        mask = ~(((XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog)) - 1);
        first_index = agino & mask;
        write_lock(&pag->pag_ici_lock);
@@ -239,6 +240,8 @@ finish_inode:
                BUG_ON(error != -EEXIST);
                write_unlock(&pag->pag_ici_lock);
                radix_tree_preload_end();
+               if (lock_flags)
+                       xfs_iunlock(ip, lock_flags);
                xfs_idestroy(ip);
                XFS_STATS_INC(xs_ig_dup);
                goto again;

<Prev in Thread] Current Thread [Next in Thread>