diff mbox

xfs: use xfs_trans_getsb in xfs_sync_sb_buf

Message ID bd3ee55c-30a4-4e45-10fc-3458c7b93a1d@redhat.com (mailing list archive)
State Accepted
Headers show

Commit Message

Eric Sandeen June 4, 2018, 11:50 p.m. UTC
Use xfs_trans_getsb rather than reaching right in for
mp->m_sb_bp; I think this is more correct, and it facilitates
building this libxfs code in userspace as well.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

This passes the online label test ... tbh I'm not quite
sure if I'm unwinding/unlocking/putting the bp properly
here, though, so ... eyes & advice appreciated?

--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dave Chinner June 5, 2018, 12:56 a.m. UTC | #1
On Mon, Jun 04, 2018 at 06:50:05PM -0500, Eric Sandeen wrote:
> Use xfs_trans_getsb rather than reaching right in for
> mp->m_sb_bp; I think this is more correct, and it facilitates
> building this libxfs code in userspace as well.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
> 
> This passes the online label test ... tbh I'm not quite
> sure if I'm unwinding/unlocking/putting the bp properly
> here, though, so ... eyes & advice appreciated?

I think it's ok - the transaction context is gone with the commit,
so xfs_trans_brelse() would just call xfs_buf_relse() anyway.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff mbox

Patch

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 0bc0a40764e1..5f25aac04aa9 100644
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -897,14 +897,16 @@  xfs_sync_sb_buf(
 	struct xfs_mount	*mp)
 {
 	struct xfs_trans	*tp;
+	struct xfs_buf		*bp;
 	int			error;
 
 	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_sb, 0, 0, 0, &tp);
 	if (error)
 		return error;
 
+	bp = xfs_trans_getsb(tp, mp, 0);
 	xfs_log_sb(tp);
-	xfs_trans_bhold(tp, mp->m_sb_bp);
+	xfs_trans_bhold(tp, bp);
 	xfs_trans_set_sync(tp);
 	error = xfs_trans_commit(tp);
 	if (error)
@@ -912,9 +914,9 @@  xfs_sync_sb_buf(
 	/*
 	 * write out the sb buffer to get the changes to disk
 	 */
-	error = xfs_bwrite(mp->m_sb_bp);
+	error = xfs_bwrite(bp);
 out:
-	xfs_buf_relse(mp->m_sb_bp);
+	xfs_buf_relse(bp);
 	return error;
 }