xfs: simplify xfs_trans_getsb

Source kernel commit: cead0b10f557a2331e0e131ce52aaf7ed7f5355f

Remove the mp argument as this function is only called in transaction
context, and open code xfs_getsb given that the function already accesses
the buffer pointer in the mount point directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index 1f087672a2a8e5440785f3f16c5ccf8a7224f7f8..9292a4a542372665b9c7007baf7564a07ddedea9 100644 (file)
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -91,7 +91,7 @@ void  libxfs_trans_cancel(struct xfs_trans *);
 /* cancel dfops associated with a transaction */
 void xfs_defer_cancel(struct xfs_trans *);
 
-struct xfs_buf *libxfs_trans_getsb(struct xfs_trans *, struct xfs_mount *);
+struct xfs_buf *libxfs_trans_getsb(struct xfs_trans *);
 
 void   libxfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
 void   libxfs_trans_log_inode (struct xfs_trans *, struct xfs_inode *,

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 51ce83021e879f4eba036881936769a79ae49d92..6838b727350b0145121be74358ba13cd52d40cf1 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -463,10 +463,10 @@ libxfs_trans_get_buf_map(
 
 xfs_buf_t *
 libxfs_trans_getsb(
-       xfs_trans_t             *tp,
-       struct xfs_mount        *mp)
+       struct xfs_trans        *tp)
 {
-       xfs_buf_t               *bp;
+       struct xfs_mount        *mp = tp->t_mountp;
+       struct xfs_buf          *bp;
        struct xfs_buf_log_item *bip;
        int                     len = XFS_FSS_TO_BB(mp, 1);
        DEFINE_SINGLE_BUF_MAP(map, XFS_SB_DADDR, len);

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index 302eea167f4e3e3243b852fea296401ec3526797..7c7e56a8979c105e38b6e0d05e2346418a520ba8 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -931,7 +931,7 @@ xfs_log_sb(
        struct xfs_trans        *tp)
 {
        struct xfs_mount        *mp = tp->t_mountp;
-       struct xfs_buf          *bp = xfs_trans_getsb(tp, mp);
+       struct xfs_buf          *bp = xfs_trans_getsb(tp);
 
        mp->m_sb.sb_icount = percpu_counter_sum(&mp->m_icount);
        mp->m_sb.sb_ifree = percpu_counter_sum(&mp->m_ifree);
@@ -1061,7 +1061,7 @@ xfs_sync_sb_buf(
        if (error)
                return error;
 
-       bp = xfs_trans_getsb(tp, mp);
+       bp = xfs_trans_getsb(tp);
        xfs_log_sb(tp);
        xfs_trans_bhold(tp, bp);
        xfs_trans_set_sync(tp);