1 files changed, 19 insertions, 30 deletions

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index bbdae2b4559f..f1048efa4268 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -11,16 +11,13 @@
 #include "xfs_trans_resv.h"
 #include "xfs_bit.h"
 #include "xfs_mount.h"
-#include "xfs_defer.h"
 #include "xfs_inode.h"
 #include "xfs_trans.h"
-#include "xfs_inode_item.h"
 #include "xfs_buf_item.h"
 #include "xfs_btree.h"
 #include "xfs_errortag.h"
 #include "xfs_error.h"
 #include "xfs_trace.h"
-#include "xfs_cksum.h"
 #include "xfs_alloc.h"
 #include "xfs_log.h"
 
@@ -276,7 +273,7 @@ xfs_btree_lblock_calc_crc(
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
         struct xfs_buf_log_item *bip = bp->b_log_item;
 
-        if (!xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))
+        if (!xfs_sb_version_hascrc(&bp->b_mount->m_sb))
                 return;
         if (bip)
                 block->bb_u.l.bb_lsn = cpu_to_be64(bip->bli_item.li_lsn);
@@ -288,7 +285,7 @@ xfs_btree_lblock_verify_crc(
         struct xfs_buf          *bp)
 {
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
 
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.l.bb_lsn)))
@@ -314,7 +311,7 @@ xfs_btree_sblock_calc_crc(
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
         struct xfs_buf_log_item *bip = bp->b_log_item;
 
-        if (!xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))
+        if (!xfs_sb_version_hascrc(&bp->b_mount->m_sb))
                 return;
         if (bip)
                 block->bb_u.s.bb_lsn = cpu_to_be64(bip->bli_item.li_lsn);
@@ -326,7 +323,7 @@ xfs_btree_sblock_verify_crc(
         struct xfs_buf          *bp)
 {
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
 
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn)))
@@ -691,14 +688,13 @@ xfs_buf_t *				/* buffer for fsbno */
 xfs_btree_get_bufl(
         xfs_mount_t     *mp,            /* file system mount point */
         xfs_trans_t     *tp,            /* transaction pointer */
-        xfs_fsblock_t   fsbno,          /* file system block number */
-        uint            lock)           /* lock flags for get_buf */
+        xfs_fsblock_t   fsbno)          /* file system block number */
 {
         xfs_daddr_t             d;              /* real disk block address */
 
         ASSERT(fsbno != NULLFSBLOCK);
         d = XFS_FSB_TO_DADDR(mp, fsbno);
-        return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);
+        return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);
 }
 
 /*
@@ -710,15 +706,14 @@ xfs_btree_get_bufs(
         xfs_mount_t     *mp,            /* file system mount point */
         xfs_trans_t     *tp,            /* transaction pointer */
         xfs_agnumber_t  agno,           /* allocation group number */
-        xfs_agblock_t   agbno,          /* allocation group block number */
-        uint            lock)           /* lock flags for get_buf */
+        xfs_agblock_t   agbno)          /* allocation group block number */
 {
         xfs_daddr_t             d;              /* real disk block address */
 
         ASSERT(agno != NULLAGNUMBER);
         ASSERT(agbno != NULLAGBLOCK);
         d = XFS_AGB_TO_DADDR(mp, agno, agbno);
-        return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);
+        return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);
 }
 
 /*
@@ -845,7 +840,6 @@ xfs_btree_read_bufl(
         struct xfs_mount        *mp,            /* file system mount point */
         struct xfs_trans        *tp,            /* transaction pointer */
         xfs_fsblock_t           fsbno,          /* file system block number */
-        uint                    lock,           /* lock flags for read_buf */
         struct xfs_buf          **bpp,          /* buffer for fsbno */
         int                     refval,         /* ref count value for buffer */
         const struct xfs_buf_ops *ops)
@@ -858,7 +852,7 @@ xfs_btree_read_bufl(
                 return -EFSCORRUPTED;
         d = XFS_FSB_TO_DADDR(mp, fsbno);
         error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,
-                                   mp->m_bsize, lock, &bp, ops);
+                                   mp->m_bsize, 0, &bp, ops);
         if (error)
                 return error;
         if (bp)
@@ -1185,11 +1179,10 @@ xfs_btree_init_block(
         xfs_btnum_t     btnum,
         __u16           level,
         __u16           numrecs,
-        __u64           owner,
-        unsigned int    flags)
+        __u64           owner)
 {
         xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,
-                                 btnum, level, numrecs, owner, flags);
+                                 btnum, level, numrecs, owner, 0);
 }
 
 STATIC void
@@ -1288,7 +1281,6 @@ STATIC int
 xfs_btree_get_buf_block(
         struct xfs_btree_cur    *cur,
         union xfs_btree_ptr     *ptr,
-        int                     flags,
         struct xfs_btree_block  **block,
         struct xfs_buf          **bpp)
 {
@@ -1296,14 +1288,11 @@ xfs_btree_get_buf_block(
         xfs_daddr_t             d;
         int                     error;
 
-        /* need to sort out how callers deal with failures first */
-        ASSERT(!(flags & XBF_TRYLOCK));
-
         error = xfs_btree_ptr_to_daddr(cur, ptr, &d);
         if (error)
                 return error;
         *bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,
-                                 mp->m_bsize, flags);
+                                 mp->m_bsize, 0);
 
         if (!*bpp)
                 return -ENOMEM;
@@ -2706,7 +2695,7 @@ __xfs_btree_split(
         XFS_BTREE_STATS_INC(cur, alloc);
 
         /* Set up the new block as "right". */
-        error = xfs_btree_get_buf_block(cur, &rptr, 0, &right, &rbp);
+        error = xfs_btree_get_buf_block(cur, &rptr, &right, &rbp);
         if (error)
                 goto error0;
 
@@ -2961,7 +2950,7 @@ xfs_btree_new_iroot(
         XFS_BTREE_STATS_INC(cur, alloc);
 
         /* Copy the root into a real block. */
-        error = xfs_btree_get_buf_block(cur, &nptr, 0, &cblock, &cbp);
+        error = xfs_btree_get_buf_block(cur, &nptr, &cblock, &cbp);
         if (error)
                 goto error0;
 
@@ -3058,7 +3047,7 @@ xfs_btree_new_root(
         XFS_BTREE_STATS_INC(cur, alloc);
 
         /* Set up the new block. */
-        error = xfs_btree_get_buf_block(cur, &lptr, 0, &new, &nbp);
+        error = xfs_btree_get_buf_block(cur, &lptr, &new, &nbp);
         if (error)
                 goto error0;
 
@@ -4433,7 +4422,7 @@ xfs_btree_lblock_v5hdr_verify(
         struct xfs_buf          *bp,
         uint64_t                owner)
 {
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
 
         if (!xfs_sb_version_hascrc(&mp->m_sb))
@@ -4454,7 +4443,7 @@ xfs_btree_lblock_verify(
         struct xfs_buf          *bp,
         unsigned int            max_recs)
 {
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
 
         /* numrecs verification */
@@ -4484,7 +4473,7 @@ xfs_failaddr_t
 xfs_btree_sblock_v5hdr_verify(
         struct xfs_buf          *bp)
 {
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
         struct xfs_perag        *pag = bp->b_pag;
 
@@ -4510,7 +4499,7 @@ xfs_btree_sblock_verify(
         struct xfs_buf          *bp,
         unsigned int            max_recs)
 {
-        struct xfs_mount        *mp = bp->b_target->bt_mount;
+        struct xfs_mount        *mp = bp->b_mount;
         struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
         xfs_agblock_t           agno;