[PATCH RESEND v2 03/18] xfs: Hold inode locks in xfs_ialloc

Allison Henderson
2022-08-04T19:40:33Z

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>
---
fs/xfs/xfs_inode.c | 6 +++++-
fs/xfs/xfs_qm.c | 4 +++-
fs/xfs/xfs_symlink.c | 3 +++
3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index cfdcca95594f..cce5fe7c048e 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -774,6 +774,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(
@@ -900,7 +902,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 */
@@ -1077,6 +1079,7 @@ xfs_create(
xfs_qm_dqrele(pdqp);

*ipp = ip;
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
return 0;

out_trans_cancel:
@@ -1173,6 +1176,7 @@ xfs_create_tmpfile(
xfs_qm_dqrele(pdqp);

*ipp = ip;
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
return 0;

out_trans_cancel:
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 57dd3b722265..5582c44f12ab 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -817,8 +817,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_finish_inode_setup(*ipp);
+ xfs_iunlock(*ipp, XFS_ILOCK_EXCL);
+ }
return error;
}

diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index 8389f3ef88ef..d8e120913036 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -337,6 +337,7 @@ xfs_symlink(
xfs_qm_dqrele(pdqp);

*ipp = ip;
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
return 0;

out_trans_cancel:
@@ -358,6 +359,8 @@ xfs_symlink(

if (unlock_dp_on_error)
xfs_iunlock(dp, XFS_ILOCK_EXCL);
+ if (ip)
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
}

--
2.25.1