xfs: remove wrappers around b_fspriv

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 82c797dd6520..a8718ed9776d 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -871,13 +871,9 @@ xlog_space_left(
 void
 xlog_iodone(xfs_buf_t *bp)
 {
-        xlog_in_core_t  *iclog;
-        xlog_t          *l;
-        int             aborted;
-
-        iclog = XFS_BUF_FSPRIVATE(bp, xlog_in_core_t *);
-        aborted = 0;
-        l = iclog->ic_log;
+        xlog_in_core_t  *iclog = bp->b_fspriv;
+        xlog_t          *l = iclog->ic_log;
+        int             aborted = 0;
 
         /*
          * Race to shutdown the filesystem if we see an error.
@@ -1249,9 +1245,8 @@ STATIC int
 xlog_bdstrat(
         struct xfs_buf          *bp)
 {
-        struct xlog_in_core     *iclog;
+        struct xlog_in_core     *iclog = bp->b_fspriv;
 
-        iclog = XFS_BUF_FSPRIVATE(bp, xlog_in_core_t *);
         if (iclog->ic_state & XLOG_STATE_IOERROR) {
                 XFS_BUF_ERROR(bp, EIO);
                 XFS_BUF_STALE(bp);
@@ -1358,7 +1353,7 @@ xlog_sync(xlog_t		*log,
                 iclog->ic_bwritecnt = 1;
         }
         XFS_BUF_SET_COUNT(bp, count);
-        XFS_BUF_SET_FSPRIVATE(bp, iclog);       /* save for later */
+        bp->b_fspriv = iclog;
         XFS_BUF_ZEROFLAGS(bp);
         XFS_BUF_BUSY(bp);
         XFS_BUF_ASYNC(bp);
@@ -1405,7 +1400,7 @@ xlog_sync(xlog_t		*log,
                 XFS_BUF_SET_ADDR(bp, 0);             /* logical 0 */
                 XFS_BUF_SET_PTR(bp, (xfs_caddr_t)((__psint_t)&(iclog->ic_header)+
                                             (__psint_t)count), split);
-                XFS_BUF_SET_FSPRIVATE(bp, iclog);
+                bp->b_fspriv = iclog;
                 XFS_BUF_ZEROFLAGS(bp);
                 XFS_BUF_BUSY(bp);
                 XFS_BUF_ASYNC(bp);