korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

xfs: remove unused flag arguments

Browse Source 
There are several functions which take a flag argument that is
only ever passed as "0," so remove these arguments.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Eric Sandeen 2019-06-12 09:00:00 -07:00 committed by Darrick J. Wong
parent 76dee76921
commit f5b999c03f
10 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/libxfs/xfs_ag.c
View File

@ -53,7 +53,7 @@ xfs_btroot_init(
struct xfs_buf *bp, struct xfs_buf *bp,
struct aghdr_init_data *id) struct aghdr_init_data *id)
{ {
xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno, 0); xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno);
} }
/* /*
@ -67,7 +67,7 @@ xfs_bnoroot_init(
{ {
struct xfs_alloc_rec *arec; struct xfs_alloc_rec *arec;
xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno, 0); xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno);
arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1); arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);
arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks); arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);
arec->ar_blockcount = cpu_to_be32(id->agsize - arec->ar_blockcount = cpu_to_be32(id->agsize -
@ -82,7 +82,7 @@ xfs_cntroot_init(
{ {
struct xfs_alloc_rec *arec; struct xfs_alloc_rec *arec;
xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno, 0); xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno);
arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1); arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);
arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks); arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);
arec->ar_blockcount = cpu_to_be32(id->agsize - arec->ar_blockcount = cpu_to_be32(id->agsize -
@ -101,7 +101,7 @@ xfs_rmaproot_init(
struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
struct xfs_rmap_rec *rrec; struct xfs_rmap_rec *rrec;
xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno, 0); xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno);
/* /*
* mark the AG header regions as static metadata The BNO * mark the AG header regions as static metadata The BNO

4
fs/xfs/libxfs/xfs_alloc.c
View File

@ -1627,7 +1627,7 @@ xfs_alloc_ag_vextent_small(
xfs_buf_t *bp; xfs_buf_t *bp;
bp = xfs_btree_get_bufs(args->mp, args->tp, bp = xfs_btree_get_bufs(args->mp, args->tp,
args->agno, fbno, 0); args->agno, fbno);
if (!bp) { if (!bp) {
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto error0; goto error0;
@ -2095,7 +2095,7 @@ xfs_free_agfl_block(
if (error) if (error)
return error; return error;
bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno, 0); bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno);
if (!bp) if (!bp)
return -EFSCORRUPTED; return -EFSCORRUPTED;
xfs_trans_binval(tp, bp); xfs_trans_binval(tp, bp);

2
fs/xfs/libxfs/xfs_attr_remote.c
View File

@ -535,7 +535,7 @@ xfs_attr_rmtval_set(
dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),
dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);
bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, 0); bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt);
if (!bp) if (!bp)
return -ENOMEM; return -ENOMEM;
bp->b_ops = &xfs_attr3_rmt_buf_ops; bp->b_ops = &xfs_attr3_rmt_buf_ops;

14
fs/xfs/libxfs/xfs_bmap.c
View File

@ -370,7 +370,7 @@ xfs_bmap_check_leaf_extents(
bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno)); bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));
if (!bp) { if (!bp) {
bp_release = 1; bp_release = 1;
error = xfs_btree_read_bufl(mp, NULL, bno, 0, &bp, error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
XFS_BMAP_BTREE_REF, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)
@ -454,7 +454,7 @@ xfs_bmap_check_leaf_extents(
bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno)); bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));
if (!bp) { if (!bp) {
bp_release = 1; bp_release = 1;
error = xfs_btree_read_bufl(mp, NULL, bno, 0, &bp, error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
XFS_BMAP_BTREE_REF, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)
@ -619,7 +619,7 @@ xfs_bmap_btree_to_extents(
XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,
xfs_btree_check_lptr(cur, cbno, 1)); xfs_btree_check_lptr(cur, cbno, 1));
#endif #endif
error = xfs_btree_read_bufl(mp, tp, cbno, 0, &cbp, XFS_BMAP_BTREE_REF, error = xfs_btree_read_bufl(mp, tp, cbno, &cbp, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)
return error; return error;
@ -732,7 +732,7 @@ xfs_bmap_extents_to_btree(
cur->bc_private.b.allocated++; cur->bc_private.b.allocated++;
ip->i_d.di_nblocks++; ip->i_d.di_nblocks++;
xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L); xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);
abp = xfs_btree_get_bufl(mp, tp, args.fsbno, 0); abp = xfs_btree_get_bufl(mp, tp, args.fsbno);
if (!abp) { if (!abp) {
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_unreserve_dquot; goto out_unreserve_dquot;
@ -878,7 +878,7 @@ xfs_bmap_local_to_extents(
ASSERT(args.fsbno != NULLFSBLOCK); ASSERT(args.fsbno != NULLFSBLOCK);
ASSERT(args.len == 1); ASSERT(args.len == 1);
tp->t_firstblock = args.fsbno; tp->t_firstblock = args.fsbno;
bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0); bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno);
/* /*
* Initialize the block, copy the data and log the remote buffer. * Initialize the block, copy the data and log the remote buffer.
@ -1203,7 +1203,7 @@ xfs_iread_extents(
* pointer (leftmost) at each level. * pointer (leftmost) at each level.
*/ */
while (level-- > 0) { while (level-- > 0) {
error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, error = xfs_btree_read_bufl(mp, tp, bno, &bp,
XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops); XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);
if (error) if (error)
goto out; goto out;
@ -1276,7 +1276,7 @@ xfs_iread_extents(
*/ */
if (bno == NULLFSBLOCK) if (bno == NULLFSBLOCK)
break; break;
error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, error = xfs_btree_read_bufl(mp, tp, bno, &bp,
XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops); XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);
if (error) if (error)
goto out; goto out;

30
fs/xfs/libxfs/xfs_btree.c
View File

@ -691,14 +691,13 @@ xfs_buf_t * /* buffer for fsbno */
xfs_btree_get_bufl( xfs_btree_get_bufl(
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_trans_t *tp, /* transaction pointer */ xfs_trans_t *tp, /* transaction pointer */
xfs_fsblock_t fsbno, /* file system block number */ xfs_fsblock_t fsbno) /* file system block number */
uint lock) /* lock flags for get_buf */
{ {
xfs_daddr_t d; /* real disk block address */ xfs_daddr_t d; /* real disk block address */
ASSERT(fsbno != NULLFSBLOCK); ASSERT(fsbno != NULLFSBLOCK);
d = XFS_FSB_TO_DADDR(mp, fsbno); 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 +709,14 @@ xfs_btree_get_bufs(
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_trans_t *tp, /* transaction pointer */ xfs_trans_t *tp, /* transaction pointer */
xfs_agnumber_t agno, /* allocation group number */ xfs_agnumber_t agno, /* allocation group number */
xfs_agblock_t agbno, /* allocation group block number */ xfs_agblock_t agbno) /* allocation group block number */
uint lock) /* lock flags for get_buf */
{ {
xfs_daddr_t d; /* real disk block address */ xfs_daddr_t d; /* real disk block address */
ASSERT(agno != NULLAGNUMBER); ASSERT(agno != NULLAGNUMBER);
ASSERT(agbno != NULLAGBLOCK); ASSERT(agbno != NULLAGBLOCK);
d = XFS_AGB_TO_DADDR(mp, agno, agbno); 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 +843,6 @@ xfs_btree_read_bufl(
struct xfs_mount *mp, /* file system mount point */ struct xfs_mount *mp, /* file system mount point */
struct xfs_trans *tp, /* transaction pointer */ struct xfs_trans *tp, /* transaction pointer */
xfs_fsblock_t fsbno, /* file system block number */ xfs_fsblock_t fsbno, /* file system block number */
uint lock, /* lock flags for read_buf */
struct xfs_buf **bpp, /* buffer for fsbno */ struct xfs_buf **bpp, /* buffer for fsbno */
int refval, /* ref count value for buffer */ int refval, /* ref count value for buffer */
const struct xfs_buf_ops *ops) const struct xfs_buf_ops *ops)
@ -858,7 +855,7 @@ xfs_btree_read_bufl(
return -EFSCORRUPTED; return -EFSCORRUPTED;
d = XFS_FSB_TO_DADDR(mp, fsbno); d = XFS_FSB_TO_DADDR(mp, fsbno);
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d, 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) if (error)
return error; return error;
if (bp) if (bp)
@ -1185,11 +1182,10 @@ xfs_btree_init_block(
xfs_btnum_t btnum, xfs_btnum_t btnum,
__u16 level, __u16 level,
__u16 numrecs, __u16 numrecs,
__u64 owner, __u64 owner)
unsigned int flags)
{ {
xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn, 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 STATIC void
@ -1288,7 +1284,6 @@ STATIC int
xfs_btree_get_buf_block( xfs_btree_get_buf_block(
struct xfs_btree_cur *cur, struct xfs_btree_cur *cur,
union xfs_btree_ptr *ptr, union xfs_btree_ptr *ptr,
int flags,
struct xfs_btree_block **block, struct xfs_btree_block **block,
struct xfs_buf **bpp) struct xfs_buf **bpp)
{ {
@ -1296,14 +1291,11 @@ xfs_btree_get_buf_block(
xfs_daddr_t d; xfs_daddr_t d;
int error; 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); error = xfs_btree_ptr_to_daddr(cur, ptr, &d);
if (error) if (error)
return error; return error;
*bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d, *bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,
mp->m_bsize, flags); mp->m_bsize, 0);
if (!*bpp) if (!*bpp)
return -ENOMEM; return -ENOMEM;
@ -2706,7 +2698,7 @@ __xfs_btree_split(
XFS_BTREE_STATS_INC(cur, alloc); XFS_BTREE_STATS_INC(cur, alloc);
/* Set up the new block as "right". */ /* 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) if (error)
goto error0; goto error0;
@ -2961,7 +2953,7 @@ xfs_btree_new_iroot(
XFS_BTREE_STATS_INC(cur, alloc); XFS_BTREE_STATS_INC(cur, alloc);
/* Copy the root into a real block. */ /* 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) if (error)
goto error0; goto error0;
@ -3058,7 +3050,7 @@ xfs_btree_new_root(
XFS_BTREE_STATS_INC(cur, alloc); XFS_BTREE_STATS_INC(cur, alloc);
/* Set up the new block. */ /* 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) if (error)
goto error0; goto error0;

10
fs/xfs/libxfs/xfs_btree.h
View File

@ -301,8 +301,7 @@ struct xfs_buf * /* buffer for fsbno */
xfs_btree_get_bufl( xfs_btree_get_bufl(
struct xfs_mount *mp, /* file system mount point */ struct xfs_mount *mp, /* file system mount point */
struct xfs_trans *tp, /* transaction pointer */ struct xfs_trans *tp, /* transaction pointer */
xfs_fsblock_t fsbno, /* file system block number */ xfs_fsblock_t fsbno); /* file system block number */
uint lock); /* lock flags for get_buf */
/* /*
* Get a buffer for the block, return it with no data read. * Get a buffer for the block, return it with no data read.
@ -313,8 +312,7 @@ xfs_btree_get_bufs(
struct xfs_mount *mp, /* file system mount point */ struct xfs_mount *mp, /* file system mount point */
struct xfs_trans *tp, /* transaction pointer */ struct xfs_trans *tp, /* transaction pointer */
xfs_agnumber_t agno, /* allocation group number */ xfs_agnumber_t agno, /* allocation group number */
xfs_agblock_t agbno, /* allocation group block number */ xfs_agblock_t agbno); /* allocation group block number */
uint lock); /* lock flags for get_buf */
/* /*
* Check for the cursor referring to the last block at the given level. * Check for the cursor referring to the last block at the given level.
@ -345,7 +343,6 @@ xfs_btree_read_bufl(
struct xfs_mount *mp, /* file system mount point */ struct xfs_mount *mp, /* file system mount point */
struct xfs_trans *tp, /* transaction pointer */ struct xfs_trans *tp, /* transaction pointer */
xfs_fsblock_t fsbno, /* file system block number */ xfs_fsblock_t fsbno, /* file system block number */
uint lock, /* lock flags for read_buf */
struct xfs_buf **bpp, /* buffer for fsbno */ struct xfs_buf **bpp, /* buffer for fsbno */
int refval, /* ref count value for buffer */ int refval, /* ref count value for buffer */
const struct xfs_buf_ops *ops); const struct xfs_buf_ops *ops);
@ -383,8 +380,7 @@ xfs_btree_init_block(
xfs_btnum_t btnum, xfs_btnum_t btnum,
__u16 level, __u16 level,
__u16 numrecs, __u16 numrecs,
__u64 owner, __u64 owner);
unsigned int flags);
void void
xfs_btree_init_block_int( xfs_btree_init_block_int(

2
fs/xfs/libxfs/xfs_sb.c
View File

@ -993,7 +993,7 @@ xfs_update_secondary_sbs(
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
XFS_AG_DADDR(mp, agno, XFS_SB_DADDR), XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
XFS_FSS_TO_BB(mp, 1), 0); XFS_FSS_TO_BB(mp, 1));
/* /*
* If we get an error reading or writing alternate superblocks, * If we get an error reading or writing alternate superblocks,
* continue. xfs_repair chooses the "best" superblock based * continue. xfs_repair chooses the "best" superblock based

2
fs/xfs/scrub/repair.c
View File

@ -357,7 +357,7 @@ xrep_init_btblock(
bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, fsb), bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, fsb),
XFS_FSB_TO_BB(mp, 1), 0); XFS_FSB_TO_BB(mp, 1), 0);
xfs_buf_zero(bp, 0, BBTOB(bp->b_length)); xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
xfs_btree_init_block(mp, bp, btnum, 0, 0, sc->sa.agno, 0); xfs_btree_init_block(mp, bp, btnum, 0, 0, sc->sa.agno);
xfs_trans_buf_set_type(tp, bp, XFS_BLFT_BTREE_BUF); xfs_trans_buf_set_type(tp, bp, XFS_BLFT_BTREE_BUF);
xfs_trans_log_buf(tp, bp, 0, bp->b_length); xfs_trans_log_buf(tp, bp, 0, bp->b_length);
bp->b_ops = ops; bp->b_ops = ops;

6
fs/xfs/xfs_bmap_util.c
View File

@ -276,7 +276,7 @@ xfs_bmap_count_tree(
struct xfs_btree_block *block, *nextblock; struct xfs_btree_block *block, *nextblock;
int numrecs; int numrecs;
error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, XFS_BMAP_BTREE_REF, error = xfs_btree_read_bufl(mp, tp, bno, &bp, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)
return error; return error;
@ -287,7 +287,7 @@ xfs_bmap_count_tree(
/* Not at node above leaves, count this level of nodes */ /* Not at node above leaves, count this level of nodes */
nextbno = be64_to_cpu(block->bb_u.l.bb_rightsib); nextbno = be64_to_cpu(block->bb_u.l.bb_rightsib);
while (nextbno != NULLFSBLOCK) { while (nextbno != NULLFSBLOCK) {
error = xfs_btree_read_bufl(mp, tp, nextbno, 0, &nbp, error = xfs_btree_read_bufl(mp, tp, nextbno, &nbp,
XFS_BMAP_BTREE_REF, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)
@ -321,7 +321,7 @@ xfs_bmap_count_tree(
if (nextbno == NULLFSBLOCK) if (nextbno == NULLFSBLOCK)
break; break;
bno = nextbno; bno = nextbno;
error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, error = xfs_btree_read_bufl(mp, tp, bno, &bp,
XFS_BMAP_BTREE_REF, XFS_BMAP_BTREE_REF,
&xfs_bmbt_buf_ops); &xfs_bmbt_buf_ops);
if (error) if (error)

5
fs/xfs/xfs_buf.h
View File

@ -233,11 +233,10 @@ static inline struct xfs_buf *
xfs_buf_get( xfs_buf_get(
struct xfs_buftarg *target, struct xfs_buftarg *target,
xfs_daddr_t blkno, xfs_daddr_t blkno,
size_t numblks, size_t numblks)
xfs_buf_flags_t flags)
{ {
DEFINE_SINGLE_BUF_MAP(map, blkno, numblks); DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
return xfs_buf_get_map(target, &map, 1, flags); return xfs_buf_get_map(target, &map, 1, 0);
} }
static inline struct xfs_buf * static inline struct xfs_buf *