Commit bd556211 authored by Allison Henderson's avatar Allison Henderson Committed by Darrick J. Wong
Browse files

xfs: Hold inode locks in xfs_trans_alloc_dir 



Modify xfs_trans_alloc_dir 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: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarCatherine Hoang <catherine.hoang@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 267979b4

fs/xfs/xfs_inode.c

+12 −2
Original line number Diff line number Diff line
@@ -1368,10 +1368,15 @@ xfs_link( 
	if (xfs_has_wsync(mp) || xfs_has_dirsync(mp))

		xfs_trans_set_sync(tp);



	return xfs_trans_commit(tp);

	error = xfs_trans_commit(tp);

	xfs_iunlock(tdp, XFS_ILOCK_EXCL);

	xfs_iunlock(sip, XFS_ILOCK_EXCL);

	return error;



 error_return:

	xfs_trans_cancel(tp);

	xfs_iunlock(tdp, XFS_ILOCK_EXCL);

	xfs_iunlock(sip, XFS_ILOCK_EXCL);

 std_return:

	if (error == -ENOSPC && nospace_error)

		error = nospace_error;
@@ -2781,15 +2786,20 @@ xfs_remove( 


	error = xfs_trans_commit(tp);

	if (error)

		goto std_return;

		goto out_unlock;



	if (is_dir && xfs_inode_is_filestream(ip))

		xfs_filestream_deassociate(ip);



	xfs_iunlock(ip, XFS_ILOCK_EXCL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

	return 0;



 out_trans_cancel:

	xfs_trans_cancel(tp);

 out_unlock:

	xfs_iunlock(ip, XFS_ILOCK_EXCL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

 std_return:

	return error;

}

fs/xfs/xfs_trans.c

+7 −2
Original line number Diff line number Diff line
@@ -1430,6 +1430,8 @@ xfs_trans_alloc_ichange( 
 * The caller must ensure that the on-disk dquots attached to this inode have

 * already been allocated and initialized.  The ILOCKs will be dropped when the

 * transaction is committed or cancelled.

 *

 * Caller is responsible for unlocking the inodes manually upon return

 */

int

xfs_trans_alloc_dir(
@@ -1460,8 +1462,8 @@ xfs_trans_alloc_dir( 


	xfs_lock_two_inodes(dp, XFS_ILOCK_EXCL, ip, XFS_ILOCK_EXCL);



	xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, dp, 0);

	xfs_trans_ijoin(tp, ip, 0);



	error = xfs_qm_dqattach_locked(dp, false);

	if (error) {
@@ -1484,6 +1486,9 @@ xfs_trans_alloc_dir( 
	if (error == -EDQUOT || error == -ENOSPC) {

		if (!retried) {

			xfs_trans_cancel(tp);

			xfs_iunlock(dp, XFS_ILOCK_EXCL);

			if (dp != ip)

				xfs_iunlock(ip, XFS_ILOCK_EXCL);

			xfs_blockgc_free_quota(dp, 0);

			retried = true;

			goto retry;