7 files changed, 13 insertions, 27 deletions

diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index bdd9cb54d63b..ce84ffd0264c 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -452,7 +452,7 @@ xfs_alloc_read_agfl(
         if (error)
                 return error;
         ASSERT(!xfs_buf_geterror(bp));
-        XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGFL, XFS_AGFL_REF);
+        xfs_buf_set_ref(bp, XFS_AGFL_REF);
         *bpp = bp;
         return 0;
 }
@@ -2139,7 +2139,7 @@ xfs_read_agf(
                 xfs_trans_brelse(tp, *bpp);
                 return XFS_ERROR(EFSCORRUPTED);
         }
-        XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_AGF, XFS_AGF_REF);
+        xfs_buf_set_ref(*bpp, XFS_AGF_REF);
         return 0;
 }
 
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 28cc0199dc1f..1f19f03af9d3 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -631,7 +631,7 @@ xfs_btree_read_bufl(
         }
         ASSERT(!xfs_buf_geterror(bp));
         if (bp)
-                XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
+                xfs_buf_set_ref(bp, refval);
         *bpp = bp;
         return 0;
 }
@@ -939,13 +939,13 @@ xfs_btree_set_refs(
         switch (cur->bc_btnum) {
         case XFS_BTNUM_BNO:
         case XFS_BTNUM_CNT:
-                XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_ALLOC_BTREE_REF);
+                xfs_buf_set_ref(bp, XFS_ALLOC_BTREE_REF);
                 break;
         case XFS_BTNUM_INO:
-                XFS_BUF_SET_VTYPE_REF(bp, B_FS_INOMAP, XFS_INO_BTREE_REF);
+                xfs_buf_set_ref(bp, XFS_INO_BTREE_REF);
                 break;
         case XFS_BTNUM_BMAP:
-                XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, XFS_BMAP_BTREE_REF);
+                xfs_buf_set_ref(bp, XFS_BMAP_BTREE_REF);
                 break;
         default:
                 ASSERT(0);
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 65181220c9a2..ca2934717343 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -278,15 +278,10 @@ void xfs_buf_stale(struct xfs_buf *bp);
 #define XFS_BUF_SIZE(bp)                ((bp)->b_buffer_length)
 #define XFS_BUF_SET_SIZE(bp, cnt)       ((bp)->b_buffer_length = (cnt))
 
-static inline void
-xfs_buf_set_ref(
-        struct xfs_buf  *bp,
-        int             lru_ref)
+static inline void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)
 {
         atomic_set(&bp->b_lru_ref, lru_ref);
 }
-#define XFS_BUF_SET_VTYPE_REF(bp, type, ref)    xfs_buf_set_ref(bp, ref)
-#define XFS_BUF_SET_VTYPE(bp, type)             do { } while (0)
 
 static inline int xfs_buf_ispinned(struct xfs_buf *bp)
 {
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 46c8aa2740da..77c74257c2a3 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -2053,13 +2053,10 @@ xfs_da_do_buf(
                 if (!bp)
                         continue;
                 if (caller == 1) {
-                        if (whichfork == XFS_ATTR_FORK) {
-                                XFS_BUF_SET_VTYPE_REF(bp, B_FS_ATTR_BTREE,
-                                                XFS_ATTR_BTREE_REF);
-                        } else {
-                                XFS_BUF_SET_VTYPE_REF(bp, B_FS_DIR_BTREE,
-                                                XFS_DIR_BTREE_REF);
-                        }
+                        if (whichfork == XFS_ATTR_FORK)
+                                xfs_buf_set_ref(bp, XFS_ATTR_BTREE_REF);
+                        else
+                                xfs_buf_set_ref(bp, XFS_DIR_BTREE_REF);
                 }
                 if (bplist) {
                         bplist[nbplist++] = bp;
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index c597bfe4ada0..25d7280e9f6b 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -605,7 +605,7 @@ xfs_qm_dqread(
         dqp->q_res_rtbcount = be64_to_cpu(ddqp->d_rtbcount);
 
         /* Mark the buf so that this will stay incore a little longer */
-        XFS_BUF_SET_VTYPE_REF(bp, B_FS_DQUOT, XFS_DQUOT_REF);
+        xfs_buf_set_ref(bp, XFS_DQUOT_REF);
 
         /*
          * We got the buffer with a xfs_trans_read_buf() (in dqtobp())
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 207e0b0c0730..169380e66057 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -1505,7 +1505,7 @@ xfs_read_agi(
                 return XFS_ERROR(EFSCORRUPTED);
         }
 
-        XFS_BUF_SET_VTYPE_REF(*bpp, B_FS_AGI, XFS_AGI_REF);
+        xfs_buf_set_ref(*bpp, XFS_AGI_REF);
 
         xfs_check_agi_unlinked(agi);
         return 0;
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index b676494a55ca..21cec6cdf453 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -190,12 +190,6 @@ xfs_imap_to_bp(
         }
 
         xfs_inobp_check(mp, bp);
-
-        /*
-         * Mark the buffer as an inode buffer now that it looks good
-         */
-        XFS_BUF_SET_VTYPE(bp, B_FS_INO);
-
         *bpp = bp;
         return 0;
 }