Skip to contentSkip to conversation

xfs: fix unlock in xfs_bmap_add_attrfork

PATCH Superseded Mark Tinguely 2 participants 3 messages Nov 6, 2013 – Nov 7, 2013 XFS filesystem

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xfs: fix unlock in xfs_bmap_add_attrfork

xfs_trans_ijoin() activates the inode in a transaction and also can specify which lock to free when the transaction is committed or canceled.

xfs_bmap_add_attrfork call locks and add the lock to the transaction but also manually removes the lock. Change the routine to not add the lock to the transaction and manually remove lock on completion.

While here, clean up the xfs_trans_cancel flags and goto names.

---
v2 per Dave's suggestion:
remove the lock from the transaction
adjust the cancel_flags.

 fs/xfs/xfs_bmap.c |   37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)
fs/xfs/xfs_bmap.c +20 -17
Index: b/fs/xfs/xfs_bmap.c
===================================================================
@@ -1137,6 +1137,7 @@ xfs_bmap_add_attrfork(
 	int			committed;	/* xaction was committed */
 	int			logflags;	/* logging flags */
 	int			error;		/* error return value */
+	int			cancel_flags = 0;
 
 	ASSERT(XFS_IFORK_Q(ip) == 0);
 
@@ -1147,19 +1148,20 @@ xfs_bmap_add_attrfork(
 	if (rsvd)
 		tp->t_flags |= XFS_TRANS_RESERVE;
 	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_addafork, blks, 0);
-	if (error)
-		goto error0;
+	if (error) {
+		xfs_trans_cancel(tp, 0);
+		return error;
+	}
+	cancel_flags = XFS_TRANS_RELEASE_LOG_RES;
 	xfs_ilock(ip, XFS_ILOCK_EXCL);
 	error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd ?
 			XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES :
 			XFS_QMOPT_RES_REGBLKS);
-	if (error) {
-		xfs_iunlock(ip, XFS_ILOCK_EXCL);
-		xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES);
-		return error;
-	}
+	if (error)
+		goto trans_cancel;
+	cancel_flags |= XFS_TRANS_ABORT;
 	if (XFS_IFORK_Q(ip))
-		goto error1;
+		goto trans_cancel;
 	if (ip->i_d.di_aformat != XFS_DINODE_FMT_EXTENTS) {
 		/*
 		 * For inodes coming from pre-6.2 filesystems.
@@ -1169,7 +1171,7 @@ xfs_bmap_add_attrfork(
 	}
 	ASSERT(ip->i_d.di_anextents == 0);
 
-	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+	xfs_trans_ijoin(tp, ip, 0);
 	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 
 	switch (ip->i_d.di_format) {
@@ -1191,7 +1193,7 @@ xfs_bmap_add_attrfork(
 	default:
 		ASSERT(0);
 		error = XFS_ERROR(EINVAL);
-		goto error1;
+		goto trans_cancel;
 	}
 
 	ASSERT(ip->i_afp == NULL);
@@ -1219,7 +1221,7 @@ xfs_bmap_add_attrfork(
 	if (logflags)
 		xfs_trans_log_inode(tp, ip, logflags);
 	if (error)
-		goto error2;
+		goto bmap_cancel;
 	if (!xfs_sb_version_hasattr(&mp->m_sb) ||
 	   (!xfs_sb_version_hasattr2(&mp->m_sb) && version == 2)) {
 		__int64_t sbfields = 0;
@@ -1242,14 +1244,15 @@ xfs_bmap_add_attrfork(
 
 	error = xfs_bmap_finish(&tp, &flist, &committed);
 	if (error)
-		goto error2;
-	return xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
-error2:
+		goto bmap_cancel;
+	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
+	goto unlock_return;
+bmap_cancel:
 	xfs_bmap_cancel(&flist);
-error1:
+trans_cancel:
+	xfs_trans_cancel(tp, cancel_flags);
+unlock_return:
 	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-error0:
-	xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES|XFS_TRANS_ABORT);
 	return error;
 }
 

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw
Quoted 4 lines · Mark Tinguely

xfs_trans_ijoin() activates the inode in a transaction and also can specify which lock to free when the transaction is committed or canceled.

Quoted 8 lines

xfs_bmap_add_attrfork call locks and add the lock to the transaction but also manually removes the lock. Change the routine to not add the lock to the transaction and manually remove lock on completion.

While here, clean up the xfs_trans_cancel flags and goto names.

All good, except for:

Quoted 11 lines
fs/xfs/xfs_bmap.c +4 -3
@@ -1242,14 +1244,15 @@ xfs_bmap_add_attrfork(
 
 	error = xfs_bmap_finish(&tp, &flist, &committed);
 	if (error)
-		goto error2;
-	return xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
-error2:
+		goto bmap_cancel;
+	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
+	goto unlock_return;
+bmap_cancel:

fs/xfs/xfs_bmap.c xfs_bmap_add_attrfork( · line 1257

Quoted 10 lines
fs/xfs/xfs_bmap.c +3 -3
 	xfs_bmap_cancel(&flist);
-error1:
+trans_cancel:
+	xfs_trans_cancel(tp, cancel_flags);
+unlock_return:
 	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-error0:
-	xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES|XFS_TRANS_ABORT);
 	return error;
 }

This hunk. It ends up looking like this:

	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
	goto unlock_return;
bmap_cancel:
	xfs_bmap_cancel(&flist);
trans_cancel:
	xfs_trans_cancel(tp, cancel_flags);
unlock_return:
	xfs_iunlock(ip, XFS_ILOCK_EXCL);
	return error;
}

Which jumps over error handling cases on a successful completion. The conventional way of doing this is having the successful return case run straight through to the return, and having the error stack either jump back into it like so:

	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
unlock_return:
	xfs_iunlock(ip, XFS_ILOCK_EXCL);
	return error;

bmap_cancel:

	xfs_bmap_cancel(&flist);
trans_cancel:
	xfs_trans_cancel(tp, cancel_flags);
	goto unlock_return;
}

or do an additional unlock and return directly in the error stack and let the compiler optimise it appropriately.

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#2 lore raw
Quoted 16 lines · Dave Chinner
Quoted 4 lines · Mark Tinguely

xfs_trans_ijoin() activates the inode in a transaction and also can specify which lock to free when the transaction is committed or canceled.

Quoted 8 lines

xfs_bmap_add_attrfork call locks and add the lock to the transaction but also manually removes the lock. Change the routine to not add the lock to the transaction and manually remove lock on completion.

While here, clean up the xfs_trans_cancel flags and goto names.

All good, except for:

...

Quoted 31 lines

This hunk. It ends up looking like this:

	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
	goto unlock_return;
bmap_cancel:
	xfs_bmap_cancel(&flist);
trans_cancel:
	xfs_trans_cancel(tp, cancel_flags);
unlock_return:
	xfs_iunlock(ip, XFS_ILOCK_EXCL);
	return error;
}

Which jumps over error handling cases on a successful completion. The conventional way of doing this is having the successful return case run straight through to the return, and having the error stack either jump back into it like so:

	error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
unlock_return:
	xfs_iunlock(ip, XFS_ILOCK_EXCL);
	return error;

bmap_cancel:

	xfs_bmap_cancel(&flist);
trans_cancel:
	xfs_trans_cancel(tp, cancel_flags);
	goto unlock_return;
}
Quoted 6 lines

or do an additional unlock and return directly in the error stack and let the compiler optimise it appropriately.

Cheers,

Dave.

Thanks for catching that.

--Mark.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs