[05/25] libxfs: replace libxfs_getbuf with libxfs_buf_get

Message ID	158258952085.451378.16264899450919355926.stgit@magnolia (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=ByWF=4N=vger.kernel.org=linux-xfs-owner@kernel.org> Subject: [PATCH 05/25] libxfs: replace libxfs_getbuf with libxfs_buf_get From: "Darrick J. Wong" <darrick.wong@oracle.com> To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, Christoph Hellwig <hch@lst.de> Date: Mon, 24 Feb 2020 16:12:00 -0800 Message-ID: <158258952085.451378.16264899450919355926.stgit@magnolia> In-Reply-To: <158258948821.451378.9298492251721116455.stgit@magnolia> References: <158258948821.451378.9298492251721116455.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	xfsprogs: refactor buffer function names \| expand [v2,00/25] xfsprogs: refactor buffer function names [01/25] libxfs: open-code "exit on buffer read failure" in upper level callers [02/25] libxfs: remove LIBXFS_EXIT_ON_FAILURE [03/25] libxfs: remove LIBXFS_B_EXIT [04/25] libxfs: replace libxfs_putbuf with libxfs_buf_relse [05/25] libxfs: replace libxfs_getbuf with libxfs_buf_get [06/25] libxfs: replace libxfs_readbuf with libxfs_buf_read [07/25] libxfs: rename libxfs_writebufr to libxfs_bwrite [08/25] libxfs: make libxfs_readbuf_verify return an error code [09/25] libxfs: make libxfs_readbufr stash the error value in b_error [10/25] libxfs: introduce libxfs_buf_read_uncached [11/25] xfs_db: use uncached buffer reads to get the superblock [12/25] xfs_copy: use uncached buffer reads to get the superblock [13/25] libxfs: move log functions for convenience [14/25] libxfs: convert libxfs_log_clear to use uncached buffers [15/25] libxlog: use uncached buffers instead of open-coding them [16/25] libxfs: use uncached buffers for initial mkfs writes [17/25] libxfs: straighten out libxfs_writebuf naming confusion [18/25] libxfs: remove unused flags parameter to libxfs_buf_mark_dirty [19/25] libxfs: remove libxfs_writebuf_int [20/25] libxfs: remove dangerous casting between xfs_buf and cache_node [21/25] libxfs: remove dangerous casting between cache_node and xfs_buf [22/25] libxfs: remove the libxfs_{get,put}bufr APIs [23/25] libxfs: hide libxfs_getbuf_flags [24/25] libxfs: rename libxfs_readbuf_map to libxfs_buf_read_map [25/25] libxfs: rename libxfs_getbuf_map to libxfs_buf_get_map

diff --git a/include/cache.h b/include/cache.h index 552b9248..334ad263 100644 --- a/include/cache.h +++ b/include/cache.h @@ -33,7 +33,7 @@ enum { * For prefetch support, the top half of the range starts at * CACHE_PREFETCH_PRIORITY and everytime the buffer is fetched and is at or * above this priority level, it is reduced to below this level (refer to - * libxfs_getbuf). + * libxfs_buf_get). * * If we have dirty nodes, we can't recycle them until they've been cleaned. To * keep these out of the reclaimable lists (as there can be lots of them) give diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 8bca7ddf..6d86774f 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -44,6 +44,7 @@ #define xfs_btree_del_cursor libxfs_btree_del_cursor #define xfs_btree_init_block libxfs_btree_init_block #define xfs_buf_delwri_submit libxfs_buf_delwri_submit +#define xfs_buf_get libxfs_buf_get #define xfs_buf_relse libxfs_buf_relse #define xfs_bunmapi libxfs_bunmapi #define xfs_calc_dquots_per_chunk libxfs_calc_dquots_per_chunk diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h index 3ddfc0c8..50b7cef8 100644 --- a/libxfs/libxfs_io.h +++ b/libxfs/libxfs_io.h @@ -139,7 +139,7 @@ extern struct cache_operations libxfs_bcache_operations; #define libxfs_writebuf(buf, flags) \ libxfs_trace_writebuf(__FUNCTION__, __FILE__, __LINE__, \ (buf), (flags)) -#define libxfs_getbuf(dev, daddr, len) \ +#define libxfs_buf_get(dev, daddr, len) \ libxfs_trace_getbuf(__FUNCTION__, __FILE__, __LINE__, \ (dev), (daddr), (len)) #define libxfs_getbuf_map(dev, map, nmaps, flags) \ @@ -159,8 +159,9 @@ extern xfs_buf_t *libxfs_trace_readbuf_map(const char *, const char *, int, const struct xfs_buf_ops *); extern int libxfs_trace_writebuf(const char *, const char *, int, xfs_buf_t *, int); -extern xfs_buf_t *libxfs_trace_getbuf(const char *, const char *, int, - struct xfs_buftarg *, xfs_daddr_t, int); +struct xfs_buf *libxfs_trace_getbuf(const char *func, const char *file, + int line, struct xfs_buftarg *btp, xfs_daddr_t daddr, + size_t len); extern xfs_buf_t *libxfs_trace_getbuf_map(const char *, const char *, int, struct xfs_buftarg *, struct xfs_buf_map *, int, int); extern xfs_buf_t *libxfs_trace_getbuf_flags(const char *, const char *, int, @@ -175,14 +176,24 @@ extern xfs_buf_t *libxfs_readbuf(struct xfs_buftarg *, xfs_daddr_t, int, int, extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int, const struct xfs_buf_ops *); extern int libxfs_writebuf(xfs_buf_t *, int); -extern xfs_buf_t *libxfs_getbuf(struct xfs_buftarg *, xfs_daddr_t, int); extern xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int); extern xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t, int, unsigned int); void libxfs_buf_relse(struct xfs_buf *bp); -#endif +static inline struct xfs_buf* +libxfs_buf_get( + struct xfs_buftarg *target, + xfs_daddr_t blkno, + size_t numblks) +{ + DEFINE_SINGLE_BUF_MAP(map, blkno, numblks); + + return libxfs_getbuf_map(target, &map, 1, 0); +} + +#endif /* XFS_BUF_TRACING */ extern void libxfs_readbuf_verify(struct xfs_buf *bp, const struct xfs_buf_ops *ops); diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 4bd3c462..0f26120f 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -377,7 +377,6 @@ roundup_64(uint64_t x, uint32_t y) (len) = __bar; /* no set-but-unused warning */ \ NULL; \ }) -#define xfs_buf_get(devp,blkno,len) (libxfs_getbuf((devp), (blkno), (len))) #define xfs_bwrite(bp) libxfs_writebuf((bp), 0) #define xfs_buf_oneshot(bp) ((void) 0) diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 02e19e1c..99b48db2 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -30,7 +30,7 @@ * outside libxfs clears bp->b_error - very little code even checks it - so the * libxfs code is tripping on stale errors left by the userspace code. * - * We can't clear errors or zero buffer contents in libxfs_getbuf-* like we do + * We can't clear errors or zero buffer contents in libxfs_buf_get-* like we do * in the kernel, because those functions are used by the libxfs_readbuf_* * functions and hence need to leave the buffers unchanged on cache hits. This * is actually the only way to gather a write error from a libxfs_writebuf() @@ -44,7 +44,7 @@ * * IOWs, userspace is behaving quite differently to the kernel and as a result * it leaks errors from reads, invalidations and writes through - * libxfs_getbuf/libxfs_readbuf. + * libxfs_buf_get/libxfs_readbuf. * * The result of this is that until the userspace code outside libxfs is cleaned * up, functions that release buffers from userspace control (i.e @@ -384,7 +384,6 @@ libxfs_log_header( #undef libxfs_readbuf #undef libxfs_readbuf_map #undef libxfs_writebuf -#undef libxfs_getbuf #undef libxfs_getbuf_map #undef libxfs_getbuf_flags @@ -393,7 +392,8 @@ xfs_buf_t *libxfs_readbuf(struct xfs_buftarg *, xfs_daddr_t, int, int, xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int, const struct xfs_buf_ops *); int libxfs_writebuf(xfs_buf_t *, int); -xfs_buf_t *libxfs_getbuf(struct xfs_buftarg *, xfs_daddr_t, int); +struct xfs_buf *libxfs_buf_get(struct xfs_buftarg *btp, xfs_daddr_t daddr, + size_t len); xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int); xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t, int, @@ -436,11 +436,19 @@ libxfs_trace_writebuf(const char *func, const char *file, int line, xfs_buf_t *b return libxfs_writebuf(bp, flags); } -xfs_buf_t * -libxfs_trace_getbuf(const char *func, const char *file, int line, - struct xfs_buftarg *btp, xfs_daddr_t blkno, int len) +struct xfs_buf * +libxfs_trace_getbuf( + const char *func, + const char *file, + int line, + struct xfs_buftarg *btp, + xfs_daddr_t blkno, + size_t len) { - xfs_buf_t *bp = libxfs_getbuf(btp, blkno, len); + struct xfs_buf *bp; + DEFINE_SINGLE_BUF_MAP(map, blkno, numblks); + + bp = libxfs_getbuf_map(target, &map, 1, 0); __add_trace(bp, func, file, line); return bp; } @@ -799,16 +807,6 @@ reset_buf_state( LIBXFS_B_UPTODATE); } -struct xfs_buf * -libxfs_getbuf(struct xfs_buftarg *btp, xfs_daddr_t blkno, int len) -{ - struct xfs_buf *bp; - - bp = libxfs_getbuf_flags(btp, blkno, len, 0); - reset_buf_state(bp); - return bp; -} - static struct xfs_buf * __libxfs_getbuf_map(struct xfs_buftarg *btp, struct xfs_buf_map *map, int nmaps, int flags) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index fbf2b7f2..4e757ee1 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -3444,7 +3444,7 @@ prepare_devices( * the end of the device. (MD sb is ~64k from the end, take out a wider * swath to be sure) */ - buf = libxfs_getbuf(mp->m_ddev_targp, (xi->dsize - whack_blks), + buf = libxfs_buf_get(mp->m_ddev_targp, (xi->dsize - whack_blks), whack_blks); memset(buf->b_addr, 0, WHACK_SIZE); libxfs_writebuf(buf, 0); @@ -3456,13 +3456,14 @@ prepare_devices( * swap (somewhere around the page size), jfs (32k), * ext[2,3] and reiserfs (64k) - and hopefully all else. */ - buf = libxfs_getbuf(mp->m_ddev_targp, 0, whack_blks); + buf = libxfs_buf_get(mp->m_ddev_targp, 0, whack_blks); memset(buf->b_addr, 0, WHACK_SIZE); libxfs_writebuf(buf, 0); libxfs_purgebuf(buf); /* OK, now write the superblock... */ - buf = libxfs_getbuf(mp->m_ddev_targp, XFS_SB_DADDR, XFS_FSS_TO_BB(mp, 1)); + buf = libxfs_buf_get(mp->m_ddev_targp, XFS_SB_DADDR, + XFS_FSS_TO_BB(mp, 1)); buf->b_ops = &xfs_sb_buf_ops; memset(buf->b_addr, 0, cfg->sectorsize); libxfs_sb_to_disk(buf->b_addr, sbp); @@ -3482,7 +3483,7 @@ prepare_devices( /* finally, check we can write the last block in the realtime area */ if (mp->m_rtdev_targp->dev && cfg->rtblocks > 0) { - buf = libxfs_getbuf(mp->m_rtdev_targp, + buf = libxfs_buf_get(mp->m_rtdev_targp, XFS_FSB_TO_BB(mp, cfg->rtblocks - 1LL), BTOBB(cfg->blocksize)); memset(buf->b_addr, 0, cfg->blocksize); diff --git a/repair/phase5.c b/repair/phase5.c index 7f7d3d18..cdbf6697 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -689,7 +689,7 @@ prop_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); lptr->agbno = agbno; @@ -767,7 +767,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno, lptr = &btree_curs->level[i]; agbno = get_next_blockaddr(agno, i, btree_curs); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); @@ -877,7 +877,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno, lptr->agbno = get_next_blockaddr(agno, 0, btree_curs); bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(lptr->agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, lptr->agbno), XFS_FSB_TO_BB(mp, 1)); } @@ -1054,7 +1054,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); lptr->agbno = agbno; @@ -1104,7 +1104,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, xfs_agi_t *agi; int i; - agi_buf = libxfs_getbuf(mp->m_dev, + agi_buf = libxfs_buf_get(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)), mp->m_sb.sb_sectsize/BBSIZE); agi_buf->b_ops = &xfs_agi_buf_ops; @@ -1174,7 +1174,7 @@ build_ino_tree(xfs_mount_t *mp, xfs_agnumber_t agno, lptr = &btree_curs->level[i]; agbno = get_next_blockaddr(agno, i, btree_curs); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); @@ -1306,7 +1306,7 @@ build_ino_tree(xfs_mount_t *mp, xfs_agnumber_t agno, lptr->agbno = get_next_blockaddr(agno, 0, btree_curs); bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(lptr->agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, lptr->agbno), XFS_FSB_TO_BB(mp, 1)); } @@ -1459,7 +1459,7 @@ prop_rmap_cursor( bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); lptr->agbno = agbno; @@ -1569,7 +1569,7 @@ build_rmap_tree( lptr = &btree_curs->level[i]; agbno = get_next_blockaddr(agno, i, btree_curs); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); @@ -1668,7 +1668,7 @@ _("Insufficient memory to construct reverse-map cursor.")); lptr->agbno = get_next_blockaddr(agno, 0, btree_curs); bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(lptr->agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, lptr->agbno), XFS_FSB_TO_BB(mp, 1)); } @@ -1809,7 +1809,7 @@ prop_refc_cursor( bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); lptr->agbno = agbno; @@ -1874,7 +1874,7 @@ build_refcount_tree( lptr = &btree_curs->level[i]; agbno = get_next_blockaddr(agno, i, btree_curs); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno), XFS_FSB_TO_BB(mp, 1)); @@ -1961,7 +1961,7 @@ _("Insufficient memory to construct refcount cursor.")); lptr->agbno = get_next_blockaddr(agno, 0, btree_curs); bt_hdr->bb_u.s.bb_rightsib = cpu_to_be32(lptr->agbno); - lptr->buf_p = libxfs_getbuf(mp->m_dev, + lptr->buf_p = libxfs_buf_get(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, lptr->agbno), XFS_FSB_TO_BB(mp, 1)); } @@ -1996,7 +1996,7 @@ build_agf_agfl( __be32 *freelist; int error; - agf_buf = libxfs_getbuf(mp->m_dev, + agf_buf = libxfs_buf_get(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)), mp->m_sb.sb_sectsize/BBSIZE); agf_buf->b_ops = &xfs_agf_buf_ops; @@ -2068,7 +2068,7 @@ build_agf_agfl( platform_uuid_copy(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid); /* initialise the AGFL, then fill it if there are blocks left over. */ - agfl_buf = libxfs_getbuf(mp->m_dev, + agfl_buf = libxfs_buf_get(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR(mp)), mp->m_sb.sb_sectsize/BBSIZE); agfl_buf->b_ops = &xfs_agfl_buf_ops;

[05/25] libxfs: replace libxfs_getbuf with libxfs_buf_get

Commit Message

Patch