lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig
2011-10-10 16:52:45 +00:00
committed by Alex Elder
parent 5fde0326dd
commit 38f2323244
7 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_alloc.c
View File

@@ -452,7 +452,7 @@ xfs_alloc_read_agfl(
if (error) if (error)
return error; return error;
ASSERT(!xfs_buf_geterror(bp)); 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; *bpp = bp;
return 0; return 0;
} }
@@ -2139,7 +2139,7 @@ xfs_read_agf(
xfs_trans_brelse(tp, *bpp); xfs_trans_brelse(tp, *bpp);
return XFS_ERROR(EFSCORRUPTED); 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; return 0;
} }

8
fs/xfs/xfs_btree.c
View File

@@ -631,7 +631,7 @@ xfs_btree_read_bufl(
} }
ASSERT(!xfs_buf_geterror(bp)); ASSERT(!xfs_buf_geterror(bp));
if (bp) if (bp)
XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval); xfs_buf_set_ref(bp, refval);
*bpp = bp; *bpp = bp;
return 0; return 0;
} }
@@ -939,13 +939,13 @@ xfs_btree_set_refs(
switch (cur->bc_btnum) { switch (cur->bc_btnum) {
case XFS_BTNUM_BNO: case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT: 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; break;
case XFS_BTNUM_INO: 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; break;
case XFS_BTNUM_BMAP: 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; break;
default: default:
ASSERT(0); ASSERT(0);

7
fs/xfs/xfs_buf.h
View File

@@ -278,15 +278,10 @@ void xfs_buf_stale(struct xfs_buf *bp);
#define XFS_BUF_SIZE(bp) ((bp)->b_buffer_length) #define XFS_BUF_SIZE(bp) ((bp)->b_buffer_length)
#define XFS_BUF_SET_SIZE(bp, cnt) ((bp)->b_buffer_length = (cnt)) #define XFS_BUF_SET_SIZE(bp, cnt) ((bp)->b_buffer_length = (cnt))
static inline void static inline void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)
xfs_buf_set_ref(
struct xfs_buf *bp,
int lru_ref)
{ {
atomic_set(&bp->b_lru_ref, 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) static inline int xfs_buf_ispinned(struct xfs_buf *bp)
{ {

11
fs/xfs/xfs_da_btree.c
View File

@@ -2053,13 +2053,10 @@ xfs_da_do_buf(
if (!bp) if (!bp)
continue; continue;
if (caller == 1) { if (caller == 1) {
if (whichfork == XFS_ATTR_FORK) { if (whichfork == XFS_ATTR_FORK)
XFS_BUF_SET_VTYPE_REF(bp, B_FS_ATTR_BTREE, xfs_buf_set_ref(bp, XFS_ATTR_BTREE_REF);
XFS_ATTR_BTREE_REF); else
} else { xfs_buf_set_ref(bp, XFS_DIR_BTREE_REF);
XFS_BUF_SET_VTYPE_REF(bp, B_FS_DIR_BTREE,
XFS_DIR_BTREE_REF);
}
} }
if (bplist) { if (bplist) {
bplist[nbplist++] = bp; bplist[nbplist++] = bp;

2
fs/xfs/xfs_dquot.c
View File

@@ -605,7 +605,7 @@ xfs_qm_dqread(
dqp->q_res_rtbcount = be64_to_cpu(ddqp->d_rtbcount); dqp->q_res_rtbcount = be64_to_cpu(ddqp->d_rtbcount);
/* Mark the buf so that this will stay incore a little longer */ /* 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()) * We got the buffer with a xfs_trans_read_buf() (in dqtobp())

2
fs/xfs/xfs_ialloc.c
View File

@@ -1505,7 +1505,7 @@ xfs_read_agi(
return XFS_ERROR(EFSCORRUPTED); 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); xfs_check_agi_unlinked(agi);
return 0; return 0;

6
fs/xfs/xfs_inode.c
View File

@@ -190,12 +190,6 @@ xfs_imap_to_bp(
} }
xfs_inobp_check(mp, 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; *bpp = bp;
return 0; return 0;
} }