xfs: Hold inode locks in xfs_ialloc

Modify xfs_ialloc to hold locks after return.  Caller will be
responsible for manual unlock.  We will need this later to hold locks
across parent pointer operations

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Catherine Hoang <catherine.hoang@oracle.com>
[djwong: hold the parent ilocked across transaction rolls too]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index efd040094753fc5a949ea294e89af07b6c719afb..2ec005e6c1dab3d6f5a3272f63a22dc70be7e356 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -747,6 +747,8 @@ xfs_inode_inherit_flags2(
 /*
  * Initialise a newly allocated inode and return the in-core inode to the
  * caller locked exclusively.
+ *
+ * Caller is responsible for unlocking the inode manually upon return
  */
 int
 xfs_init_new_inode(
@@ -873,7 +875,7 @@ xfs_init_new_inode(
        /*
         * Log the new values stuffed into the inode.
         */
-       xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+       xfs_trans_ijoin(tp, ip, 0);
        xfs_trans_log_inode(tp, ip, flags);
 
        /* now that we have an i_mode we can setup the inode structure */
@@ -1101,8 +1103,7 @@ xfs_create(
         * the transaction cancel unlocking dp so don't do it explicitly in the
         * error path.
         */
-       xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
-       unlock_dp_on_error = false;
+       xfs_trans_ijoin(tp, dp, 0);
 
        error = xfs_dir_createname(tp, dp, name, ip->i_ino,
                                        resblks - XFS_IALLOC_SPACE_RES(mp));
@@ -1151,6 +1152,8 @@ xfs_create(
        xfs_qm_dqrele(pdqp);
 
        *ipp = ip;
+       xfs_iunlock(ip, XFS_ILOCK_EXCL);
+       xfs_iunlock(dp, XFS_ILOCK_EXCL);
        return 0;
 
  out_trans_cancel:
@@ -1162,6 +1165,7 @@ xfs_create(
         * transactions and deadlocks from xfs_inactive.
         */
        if (ip) {
+               xfs_iunlock(ip, XFS_ILOCK_EXCL);
                xfs_finish_inode_setup(ip);
                xfs_irele(ip);
        }
@@ -1247,6 +1251,7 @@ xfs_create_tmpfile(
        xfs_qm_dqrele(pdqp);
 
        *ipp = ip;
+       xfs_iunlock(ip, XFS_ILOCK_EXCL);
        return 0;
 
  out_trans_cancel:
@@ -1258,6 +1263,7 @@ xfs_create_tmpfile(
         * transactions and deadlocks from xfs_inactive.
         */
        if (ip) {
+               xfs_iunlock(ip, XFS_ILOCK_EXCL);
                xfs_finish_inode_setup(ip);
                xfs_irele(ip);
        }

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 0f4cf4170c3578091d727b9dd36ba8dcbc89878f..47120b745c47f7f0a6b7e22e7993905262691d71 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -836,8 +836,10 @@ xfs_qm_qino_alloc(
                ASSERT(xfs_is_shutdown(mp));
                xfs_alert(mp, "%s failed (error %d)!", __func__, error);
        }
-       if (need_alloc)
+       if (need_alloc) {
+               xfs_iunlock(*ipp, XFS_ILOCK_EXCL);
                xfs_finish_inode_setup(*ipp);
+       }
        return error;
 }
 

diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index fb060aaf6d40fe54ee79e562e3576adb0098eaa5..85ef56fdd7dfe8e1868c965b2f29ec7a71c02a05 100644 (file)
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -172,8 +172,7 @@ xfs_symlink(
         * the transaction cancel unlocking dp so don't do it explicitly in the
         * error path.
         */
-       xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
-       unlock_dp_on_error = false;
+       xfs_trans_ijoin(tp, dp, 0);
 
        /*
         * Also attach the dquot(s) to it, if applicable.
@@ -215,6 +214,8 @@ xfs_symlink(
        xfs_qm_dqrele(pdqp);
 
        *ipp = ip;
+       xfs_iunlock(ip, XFS_ILOCK_EXCL);
+       xfs_iunlock(dp, XFS_ILOCK_EXCL);
        return 0;
 
 out_trans_cancel:
@@ -226,6 +227,7 @@ out_release_inode:
         * transactions and deadlocks from xfs_inactive.
         */
        if (ip) {
+               xfs_iunlock(ip, XFS_ILOCK_EXCL);
                xfs_finish_inode_setup(ip);
                xfs_irele(ip);
        }