forked from Minki/linux
xfs: remove xfs_buf_t typedef
Prepare for kernel xfs_buf alignment by getting rid of the xfs_buf_t typedef from userspace. [darrick: This patch is a port of a userspace patch removing the xfs_buf_t typedef in preparation to make the userspace xfs_buf code behave more like its kernel counterpart.] Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
parent
1189686e54
commit
e82226138b
@ -690,9 +690,9 @@ xfs_alloc_read_agfl(
|
||||
xfs_mount_t *mp, /* mount point structure */
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_agnumber_t agno, /* allocation group number */
|
||||
xfs_buf_t **bpp) /* buffer for the ag free block array */
|
||||
struct xfs_buf **bpp) /* buffer for the ag free block array */
|
||||
{
|
||||
xfs_buf_t *bp; /* return value */
|
||||
struct xfs_buf *bp; /* return value */
|
||||
int error;
|
||||
|
||||
ASSERT(agno != NULLAGNUMBER);
|
||||
@ -2647,12 +2647,12 @@ out_no_agbp:
|
||||
int /* error */
|
||||
xfs_alloc_get_freelist(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_buf_t *agbp, /* buffer containing the agf structure */
|
||||
struct xfs_buf *agbp, /* buffer containing the agf structure */
|
||||
xfs_agblock_t *bnop, /* block address retrieved from freelist */
|
||||
int btreeblk) /* destination is a AGF btree */
|
||||
{
|
||||
struct xfs_agf *agf = agbp->b_addr;
|
||||
xfs_buf_t *agflbp;/* buffer for a.g. freelist structure */
|
||||
struct xfs_buf *agflbp;/* buffer for a.g. freelist structure */
|
||||
xfs_agblock_t bno; /* block number returned */
|
||||
__be32 *agfl_bno;
|
||||
int error;
|
||||
@ -2711,7 +2711,7 @@ xfs_alloc_get_freelist(
|
||||
void
|
||||
xfs_alloc_log_agf(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_buf_t *bp, /* buffer for a.g. freelist header */
|
||||
struct xfs_buf *bp, /* buffer for a.g. freelist header */
|
||||
int fields) /* mask of fields to be logged (XFS_AGF_...) */
|
||||
{
|
||||
int first; /* first byte offset */
|
||||
@ -2757,7 +2757,7 @@ xfs_alloc_pagf_init(
|
||||
xfs_agnumber_t agno, /* allocation group number */
|
||||
int flags) /* XFS_ALLOC_FLAGS_... */
|
||||
{
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
int error;
|
||||
|
||||
error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp);
|
||||
@ -2772,8 +2772,8 @@ xfs_alloc_pagf_init(
|
||||
int /* error */
|
||||
xfs_alloc_put_freelist(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_buf_t *agbp, /* buffer for a.g. freelist header */
|
||||
xfs_buf_t *agflbp,/* buffer for a.g. free block array */
|
||||
struct xfs_buf *agbp, /* buffer for a.g. freelist header */
|
||||
struct xfs_buf *agflbp,/* buffer for a.g. free block array */
|
||||
xfs_agblock_t bno, /* block being freed */
|
||||
int btreeblk) /* block came from a AGF btree */
|
||||
{
|
||||
|
@ -321,7 +321,7 @@ xfs_bmap_check_leaf_extents(
|
||||
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
|
||||
struct xfs_btree_block *block; /* current btree block */
|
||||
xfs_fsblock_t bno; /* block # of "block" */
|
||||
xfs_buf_t *bp; /* buffer for "block" */
|
||||
struct xfs_buf *bp; /* buffer for "block" */
|
||||
int error; /* error return value */
|
||||
xfs_extnum_t i=0, j; /* index into the extents list */
|
||||
int level; /* btree level, for checking */
|
||||
@ -592,7 +592,7 @@ xfs_bmap_btree_to_extents(
|
||||
struct xfs_btree_block *rblock = ifp->if_broot;
|
||||
struct xfs_btree_block *cblock;/* child btree block */
|
||||
xfs_fsblock_t cbno; /* child block number */
|
||||
xfs_buf_t *cbp; /* child block's buffer */
|
||||
struct xfs_buf *cbp; /* child block's buffer */
|
||||
int error; /* error return value */
|
||||
__be64 *pp; /* ptr to block address */
|
||||
struct xfs_owner_info oinfo;
|
||||
@ -830,7 +830,7 @@ xfs_bmap_local_to_extents(
|
||||
int flags; /* logging flags returned */
|
||||
struct xfs_ifork *ifp; /* inode fork pointer */
|
||||
xfs_alloc_arg_t args; /* allocation arguments */
|
||||
xfs_buf_t *bp; /* buffer for extent block */
|
||||
struct xfs_buf *bp; /* buffer for extent block */
|
||||
struct xfs_bmbt_irec rec;
|
||||
struct xfs_iext_cursor icur;
|
||||
|
||||
|
@ -397,7 +397,7 @@ xfs_btree_dup_cursor(
|
||||
xfs_btree_cur_t *cur, /* input cursor */
|
||||
xfs_btree_cur_t **ncur) /* output cursor */
|
||||
{
|
||||
xfs_buf_t *bp; /* btree block's buffer pointer */
|
||||
struct xfs_buf *bp; /* btree block's buffer pointer */
|
||||
int error; /* error return value */
|
||||
int i; /* level number of btree block */
|
||||
xfs_mount_t *mp; /* mount structure for filesystem */
|
||||
@ -701,7 +701,7 @@ xfs_btree_firstrec(
|
||||
int level) /* level to change */
|
||||
{
|
||||
struct xfs_btree_block *block; /* generic btree block pointer */
|
||||
xfs_buf_t *bp; /* buffer containing block */
|
||||
struct xfs_buf *bp; /* buffer containing block */
|
||||
|
||||
/*
|
||||
* Get the block pointer for this level.
|
||||
@ -731,7 +731,7 @@ xfs_btree_lastrec(
|
||||
int level) /* level to change */
|
||||
{
|
||||
struct xfs_btree_block *block; /* generic btree block pointer */
|
||||
xfs_buf_t *bp; /* buffer containing block */
|
||||
struct xfs_buf *bp; /* buffer containing block */
|
||||
|
||||
/*
|
||||
* Get the block pointer for this level.
|
||||
@ -993,7 +993,7 @@ STATIC void
|
||||
xfs_btree_setbuf(
|
||||
xfs_btree_cur_t *cur, /* btree cursor */
|
||||
int lev, /* level in btree */
|
||||
xfs_buf_t *bp) /* new buffer to set */
|
||||
struct xfs_buf *bp) /* new buffer to set */
|
||||
{
|
||||
struct xfs_btree_block *b; /* btree block */
|
||||
|
||||
@ -1636,7 +1636,7 @@ xfs_btree_decrement(
|
||||
int *stat) /* success/failure */
|
||||
{
|
||||
struct xfs_btree_block *block;
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
int error; /* error return value */
|
||||
int lev;
|
||||
union xfs_btree_ptr ptr;
|
||||
|
@ -2459,7 +2459,7 @@ out_map:
|
||||
void
|
||||
xfs_ialloc_log_agi(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_buf_t *bp, /* allocation group header buffer */
|
||||
struct xfs_buf *bp, /* allocation group header buffer */
|
||||
int fields) /* bitmask of fields to log */
|
||||
{
|
||||
int first; /* first byte number */
|
||||
@ -2680,7 +2680,7 @@ xfs_ialloc_pagi_init(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_agnumber_t agno) /* allocation group number */
|
||||
{
|
||||
xfs_buf_t *bp = NULL;
|
||||
struct xfs_buf *bp = NULL;
|
||||
int error;
|
||||
|
||||
error = xfs_ialloc_read_agi(mp, tp, agno, &bp);
|
||||
|
@ -56,9 +56,9 @@ xfs_rtbuf_get(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_rtblock_t block, /* block number in bitmap or summary */
|
||||
int issum, /* is summary not bitmap */
|
||||
xfs_buf_t **bpp) /* output: buffer for the block */
|
||||
struct xfs_buf **bpp) /* output: buffer for the block */
|
||||
{
|
||||
xfs_buf_t *bp; /* block buffer, result */
|
||||
struct xfs_buf *bp; /* block buffer, result */
|
||||
xfs_inode_t *ip; /* bitmap or summary inode */
|
||||
xfs_bmbt_irec_t map;
|
||||
int nmap = 1;
|
||||
@ -101,7 +101,7 @@ xfs_rtfind_back(
|
||||
xfs_rtword_t *b; /* current word in buffer */
|
||||
int bit; /* bit number in the word */
|
||||
xfs_rtblock_t block; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* buf for the block */
|
||||
struct xfs_buf *bp; /* buf for the block */
|
||||
xfs_rtword_t *bufp; /* starting word in buffer */
|
||||
int error; /* error value */
|
||||
xfs_rtblock_t firstbit; /* first useful bit in the word */
|
||||
@ -276,7 +276,7 @@ xfs_rtfind_forw(
|
||||
xfs_rtword_t *b; /* current word in buffer */
|
||||
int bit; /* bit number in the word */
|
||||
xfs_rtblock_t block; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* buf for the block */
|
||||
struct xfs_buf *bp; /* buf for the block */
|
||||
xfs_rtword_t *bufp; /* starting word in buffer */
|
||||
int error; /* error value */
|
||||
xfs_rtblock_t i; /* current bit number rel. to start */
|
||||
@ -447,11 +447,11 @@ xfs_rtmodify_summary_int(
|
||||
int log, /* log2 of extent size */
|
||||
xfs_rtblock_t bbno, /* bitmap block number */
|
||||
int delta, /* change to make to summary info */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_suminfo_t *sum) /* out: summary info for this block */
|
||||
{
|
||||
xfs_buf_t *bp; /* buffer for the summary block */
|
||||
struct xfs_buf *bp; /* buffer for the summary block */
|
||||
int error; /* error value */
|
||||
xfs_fsblock_t sb; /* summary fsblock */
|
||||
int so; /* index into the summary file */
|
||||
@ -517,7 +517,7 @@ xfs_rtmodify_summary(
|
||||
int log, /* log2 of extent size */
|
||||
xfs_rtblock_t bbno, /* bitmap block number */
|
||||
int delta, /* change to make to summary info */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb) /* in/out: summary block number */
|
||||
{
|
||||
return xfs_rtmodify_summary_int(mp, tp, log, bbno,
|
||||
@ -539,7 +539,7 @@ xfs_rtmodify_range(
|
||||
xfs_rtword_t *b; /* current word in buffer */
|
||||
int bit; /* bit number in the word */
|
||||
xfs_rtblock_t block; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* buf for the block */
|
||||
struct xfs_buf *bp; /* buf for the block */
|
||||
xfs_rtword_t *bufp; /* starting word in buffer */
|
||||
int error; /* error value */
|
||||
xfs_rtword_t *first; /* first used word in the buffer */
|
||||
@ -690,7 +690,7 @@ xfs_rtfree_range(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_rtblock_t start, /* starting block to free */
|
||||
xfs_extlen_t len, /* length to free */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb) /* in/out: summary block number */
|
||||
{
|
||||
xfs_rtblock_t end; /* end of the freed extent */
|
||||
@ -773,7 +773,7 @@ xfs_rtcheck_range(
|
||||
xfs_rtword_t *b; /* current word in buffer */
|
||||
int bit; /* bit number in the word */
|
||||
xfs_rtblock_t block; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* buf for the block */
|
||||
struct xfs_buf *bp; /* buf for the block */
|
||||
xfs_rtword_t *bufp; /* starting word in buffer */
|
||||
int error; /* error value */
|
||||
xfs_rtblock_t i; /* current bit number rel. to start */
|
||||
@ -969,7 +969,7 @@ xfs_rtfree_extent(
|
||||
int error; /* error value */
|
||||
xfs_mount_t *mp; /* file system mount structure */
|
||||
xfs_fsblock_t sb; /* summary file block number */
|
||||
xfs_buf_t *sumbp = NULL; /* summary file block buffer */
|
||||
struct xfs_buf *sumbp = NULL; /* summary file block buffer */
|
||||
|
||||
mp = tp->t_mountp;
|
||||
|
||||
|
@ -278,7 +278,7 @@ _xfs_buf_alloc(
|
||||
*/
|
||||
STATIC int
|
||||
_xfs_buf_get_pages(
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
int page_count)
|
||||
{
|
||||
/* Make sure that we have a page list */
|
||||
@ -302,7 +302,7 @@ _xfs_buf_get_pages(
|
||||
*/
|
||||
STATIC void
|
||||
_xfs_buf_free_pages(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
if (bp->b_pages != bp->b_page_array) {
|
||||
kmem_free(bp->b_pages);
|
||||
@ -319,7 +319,7 @@ _xfs_buf_free_pages(
|
||||
*/
|
||||
static void
|
||||
xfs_buf_free(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
trace_xfs_buf_free(bp, _RET_IP_);
|
||||
|
||||
@ -352,7 +352,7 @@ xfs_buf_free(
|
||||
*/
|
||||
STATIC int
|
||||
xfs_buf_allocate_memory(
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
uint flags)
|
||||
{
|
||||
size_t size;
|
||||
@ -463,7 +463,7 @@ out_free_pages:
|
||||
*/
|
||||
STATIC int
|
||||
_xfs_buf_map_pages(
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
uint flags)
|
||||
{
|
||||
ASSERT(bp->b_flags & _XBF_PAGES);
|
||||
@ -590,7 +590,7 @@ xfs_buf_find(
|
||||
struct xfs_buf **found_bp)
|
||||
{
|
||||
struct xfs_perag *pag;
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
struct xfs_buf_map cmap = { .bm_bn = map[0].bm_bn };
|
||||
xfs_daddr_t eofs;
|
||||
int i;
|
||||
@ -762,7 +762,7 @@ found:
|
||||
|
||||
int
|
||||
_xfs_buf_read(
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
xfs_buf_flags_t flags)
|
||||
{
|
||||
ASSERT(!(flags & XBF_WRITE));
|
||||
@ -1005,7 +1005,7 @@ xfs_buf_get_uncached(
|
||||
*/
|
||||
void
|
||||
xfs_buf_hold(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
trace_xfs_buf_hold(bp, _RET_IP_);
|
||||
atomic_inc(&bp->b_hold);
|
||||
@ -1017,7 +1017,7 @@ xfs_buf_hold(
|
||||
*/
|
||||
void
|
||||
xfs_buf_rele(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_perag *pag = bp->b_pag;
|
||||
bool release;
|
||||
@ -1161,7 +1161,7 @@ xfs_buf_unlock(
|
||||
|
||||
STATIC void
|
||||
xfs_buf_wait_unpin(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
DECLARE_WAITQUEUE (wait, current);
|
||||
|
||||
@ -1373,7 +1373,7 @@ xfs_buf_ioend_work(
|
||||
struct work_struct *work)
|
||||
{
|
||||
struct xfs_buf *bp =
|
||||
container_of(work, xfs_buf_t, b_ioend_work);
|
||||
container_of(work, struct xfs_buf, b_ioend_work);
|
||||
|
||||
xfs_buf_ioend(bp);
|
||||
}
|
||||
@ -1388,7 +1388,7 @@ xfs_buf_ioend_async(
|
||||
|
||||
void
|
||||
__xfs_buf_ioerror(
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
int error,
|
||||
xfs_failaddr_t failaddr)
|
||||
{
|
||||
|
@ -124,7 +124,7 @@ struct xfs_buf_ops {
|
||||
xfs_failaddr_t (*verify_struct)(struct xfs_buf *bp);
|
||||
};
|
||||
|
||||
typedef struct xfs_buf {
|
||||
struct xfs_buf {
|
||||
/*
|
||||
* first cacheline holds all the fields needed for an uncontended cache
|
||||
* hit to be fully processed. The semaphore straddles the cacheline
|
||||
@ -190,7 +190,7 @@ typedef struct xfs_buf {
|
||||
int b_last_error;
|
||||
|
||||
const struct xfs_buf_ops *b_ops;
|
||||
} xfs_buf_t;
|
||||
};
|
||||
|
||||
/* Finding and Reading Buffers */
|
||||
struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target,
|
||||
@ -253,16 +253,16 @@ int _xfs_buf_read(struct xfs_buf *bp, xfs_buf_flags_t flags);
|
||||
void xfs_buf_hold(struct xfs_buf *bp);
|
||||
|
||||
/* Releasing Buffers */
|
||||
extern void xfs_buf_rele(xfs_buf_t *);
|
||||
extern void xfs_buf_rele(struct xfs_buf *);
|
||||
|
||||
/* Locking and Unlocking Buffers */
|
||||
extern int xfs_buf_trylock(xfs_buf_t *);
|
||||
extern void xfs_buf_lock(xfs_buf_t *);
|
||||
extern void xfs_buf_unlock(xfs_buf_t *);
|
||||
extern int xfs_buf_trylock(struct xfs_buf *);
|
||||
extern void xfs_buf_lock(struct xfs_buf *);
|
||||
extern void xfs_buf_unlock(struct xfs_buf *);
|
||||
#define xfs_buf_islocked(bp) \
|
||||
((bp)->b_sema.count <= 0)
|
||||
|
||||
static inline void xfs_buf_relse(xfs_buf_t *bp)
|
||||
static inline void xfs_buf_relse(struct xfs_buf *bp)
|
||||
{
|
||||
xfs_buf_unlock(bp);
|
||||
xfs_buf_rele(bp);
|
||||
|
@ -412,7 +412,7 @@ xfs_buf_item_unpin(
|
||||
int remove)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = BUF_ITEM(lip);
|
||||
xfs_buf_t *bp = bip->bli_buf;
|
||||
struct xfs_buf *bp = bip->bli_buf;
|
||||
int stale = bip->bli_flags & XFS_BLI_STALE;
|
||||
int freed;
|
||||
|
||||
@ -942,7 +942,7 @@ xfs_buf_item_free(
|
||||
*/
|
||||
void
|
||||
xfs_buf_item_relse(
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
|
@ -28,7 +28,7 @@ xfs_growfs_data_private(
|
||||
xfs_mount_t *mp, /* mount point for filesystem */
|
||||
xfs_growfs_data_t *in) /* growfs data input struct */
|
||||
{
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
int error;
|
||||
xfs_agnumber_t nagcount;
|
||||
xfs_agnumber_t nagimax = 0;
|
||||
|
@ -2631,7 +2631,7 @@ xlog_recover_clear_agi_bucket(
|
||||
{
|
||||
xfs_trans_t *tp;
|
||||
xfs_agi_t *agi;
|
||||
xfs_buf_t *agibp;
|
||||
struct xfs_buf *agibp;
|
||||
int offset;
|
||||
int error;
|
||||
|
||||
@ -2749,7 +2749,7 @@ xlog_recover_process_iunlinks(
|
||||
xfs_mount_t *mp;
|
||||
xfs_agnumber_t agno;
|
||||
xfs_agi_t *agi;
|
||||
xfs_buf_t *agibp;
|
||||
struct xfs_buf *agibp;
|
||||
xfs_agino_t agino;
|
||||
int bucket;
|
||||
int error;
|
||||
@ -3501,8 +3501,8 @@ xlog_recover_check_summary(
|
||||
struct xlog *log)
|
||||
{
|
||||
xfs_mount_t *mp;
|
||||
xfs_buf_t *agfbp;
|
||||
xfs_buf_t *agibp;
|
||||
struct xfs_buf *agfbp;
|
||||
struct xfs_buf *agibp;
|
||||
xfs_agnumber_t agno;
|
||||
uint64_t freeblks;
|
||||
uint64_t itotal;
|
||||
|
@ -32,7 +32,7 @@ xfs_rtget_summary(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
int log, /* log2 of extent size */
|
||||
xfs_rtblock_t bbno, /* bitmap block number */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_suminfo_t *sum) /* out: summary info for this block */
|
||||
{
|
||||
@ -50,7 +50,7 @@ xfs_rtany_summary(
|
||||
int low, /* low log2 extent size */
|
||||
int high, /* high log2 extent size */
|
||||
xfs_rtblock_t bbno, /* bitmap block number */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
int *stat) /* out: any good extents here? */
|
||||
{
|
||||
@ -104,7 +104,7 @@ xfs_rtcopy_summary(
|
||||
xfs_trans_t *tp) /* transaction pointer */
|
||||
{
|
||||
xfs_rtblock_t bbno; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* summary buffer */
|
||||
struct xfs_buf *bp; /* summary buffer */
|
||||
int error; /* error return value */
|
||||
int log; /* summary level number (log length) */
|
||||
xfs_suminfo_t sum; /* summary data */
|
||||
@ -144,7 +144,7 @@ xfs_rtallocate_range(
|
||||
xfs_trans_t *tp, /* transaction pointer */
|
||||
xfs_rtblock_t start, /* start block to allocate */
|
||||
xfs_extlen_t len, /* length to allocate */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb) /* in/out: summary block number */
|
||||
{
|
||||
xfs_rtblock_t end; /* end of the allocated extent */
|
||||
@ -226,7 +226,7 @@ xfs_rtallocate_extent_block(
|
||||
xfs_extlen_t maxlen, /* maximum length to allocate */
|
||||
xfs_extlen_t *len, /* out: actual length allocated */
|
||||
xfs_rtblock_t *nextp, /* out: next block to try */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_extlen_t prod, /* extent product factor */
|
||||
xfs_rtblock_t *rtblock) /* out: start block allocated */
|
||||
@ -345,7 +345,7 @@ xfs_rtallocate_extent_exact(
|
||||
xfs_extlen_t minlen, /* minimum length to allocate */
|
||||
xfs_extlen_t maxlen, /* maximum length to allocate */
|
||||
xfs_extlen_t *len, /* out: actual length allocated */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_extlen_t prod, /* extent product factor */
|
||||
xfs_rtblock_t *rtblock) /* out: start block allocated */
|
||||
@ -424,7 +424,7 @@ xfs_rtallocate_extent_near(
|
||||
xfs_extlen_t minlen, /* minimum length to allocate */
|
||||
xfs_extlen_t maxlen, /* maximum length to allocate */
|
||||
xfs_extlen_t *len, /* out: actual length allocated */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_extlen_t prod, /* extent product factor */
|
||||
xfs_rtblock_t *rtblock) /* out: start block allocated */
|
||||
@ -626,7 +626,7 @@ xfs_rtallocate_extent_size(
|
||||
xfs_extlen_t minlen, /* minimum length to allocate */
|
||||
xfs_extlen_t maxlen, /* maximum length to allocate */
|
||||
xfs_extlen_t *len, /* out: actual length allocated */
|
||||
xfs_buf_t **rbpp, /* in/out: summary block buffer */
|
||||
struct xfs_buf **rbpp, /* in/out: summary block buffer */
|
||||
xfs_fsblock_t *rsb, /* in/out: summary block number */
|
||||
xfs_extlen_t prod, /* extent product factor */
|
||||
xfs_rtblock_t *rtblock) /* out: start block allocated */
|
||||
@ -900,7 +900,7 @@ xfs_growfs_rt(
|
||||
xfs_growfs_rt_t *in) /* growfs rt input struct */
|
||||
{
|
||||
xfs_rtblock_t bmbno; /* bitmap block number */
|
||||
xfs_buf_t *bp; /* temporary buffer */
|
||||
struct xfs_buf *bp; /* temporary buffer */
|
||||
int error; /* error return value */
|
||||
xfs_mount_t *nmp; /* new (fake) mount structure */
|
||||
xfs_rfsblock_t nrblocks; /* new number of realtime blocks */
|
||||
@ -1151,7 +1151,7 @@ xfs_rtallocate_extent(
|
||||
int error; /* error value */
|
||||
xfs_rtblock_t r; /* result allocated block */
|
||||
xfs_fsblock_t sb; /* summary file block number */
|
||||
xfs_buf_t *sumbp; /* summary file block buffer */
|
||||
struct xfs_buf *sumbp; /* summary file block buffer */
|
||||
|
||||
ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));
|
||||
ASSERT(minlen > 0 && minlen <= maxlen);
|
||||
|
@ -115,10 +115,10 @@ int xfs_rtmodify_range(struct xfs_mount *mp, struct xfs_trans *tp,
|
||||
xfs_rtblock_t start, xfs_extlen_t len, int val);
|
||||
int xfs_rtmodify_summary_int(struct xfs_mount *mp, struct xfs_trans *tp,
|
||||
int log, xfs_rtblock_t bbno, int delta,
|
||||
xfs_buf_t **rbpp, xfs_fsblock_t *rsb,
|
||||
struct xfs_buf **rbpp, xfs_fsblock_t *rsb,
|
||||
xfs_suminfo_t *sum);
|
||||
int xfs_rtmodify_summary(struct xfs_mount *mp, struct xfs_trans *tp, int log,
|
||||
xfs_rtblock_t bbno, int delta, xfs_buf_t **rbpp,
|
||||
xfs_rtblock_t bbno, int delta, struct xfs_buf **rbpp,
|
||||
xfs_fsblock_t *rsb);
|
||||
int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,
|
||||
xfs_rtblock_t start, xfs_extlen_t len,
|
||||
|
@ -154,7 +154,7 @@ xfs_symlink(
|
||||
const char *cur_chunk;
|
||||
int byte_cnt;
|
||||
int n;
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
prid_t prid;
|
||||
struct xfs_dquot *udqp = NULL;
|
||||
struct xfs_dquot *gdqp = NULL;
|
||||
@ -365,7 +365,7 @@ STATIC int
|
||||
xfs_inactive_symlink_rmt(
|
||||
struct xfs_inode *ip)
|
||||
{
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
int done;
|
||||
int error;
|
||||
int i;
|
||||
|
@ -465,7 +465,7 @@ xfs_trans_apply_sb_deltas(
|
||||
xfs_trans_t *tp)
|
||||
{
|
||||
xfs_dsb_t *sbp;
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
int whole = 0;
|
||||
|
||||
bp = xfs_trans_getsb(tp);
|
||||
|
@ -121,7 +121,7 @@ xfs_trans_get_buf_map(
|
||||
xfs_buf_flags_t flags,
|
||||
struct xfs_buf **bpp)
|
||||
{
|
||||
xfs_buf_t *bp;
|
||||
struct xfs_buf *bp;
|
||||
struct xfs_buf_log_item *bip;
|
||||
int error;
|
||||
|
||||
@ -401,7 +401,7 @@ xfs_trans_brelse(
|
||||
void
|
||||
xfs_trans_bhold(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
@ -422,7 +422,7 @@ xfs_trans_bhold(
|
||||
void
|
||||
xfs_trans_bhold_release(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
@ -538,7 +538,7 @@ xfs_trans_log_buf(
|
||||
void
|
||||
xfs_trans_binval(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
int i;
|
||||
@ -593,7 +593,7 @@ xfs_trans_binval(
|
||||
void
|
||||
xfs_trans_inode_buf(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
@ -618,7 +618,7 @@ xfs_trans_inode_buf(
|
||||
void
|
||||
xfs_trans_stale_inode_buf(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
@ -643,7 +643,7 @@ xfs_trans_stale_inode_buf(
|
||||
void
|
||||
xfs_trans_inode_alloc_buf(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp)
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
||||
@ -737,7 +737,7 @@ xfs_trans_buf_copy_type(
|
||||
void
|
||||
xfs_trans_dquot_buf(
|
||||
xfs_trans_t *tp,
|
||||
xfs_buf_t *bp,
|
||||
struct xfs_buf *bp,
|
||||
uint type)
|
||||
{
|
||||
struct xfs_buf_log_item *bip = bp->b_log_item;
|
||||
|
Loading…
Reference in New Issue
Block a user