[04/35] xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h

Message ID	20240215120907.1542854-5-cem@kernel.org (mailing list archive)
State	Accepted, archived
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6742712BF17 for <linux-xfs@vger.kernel.org>; Thu, 15 Feb 2024 12:09:19 +0000 (UTC) From: cem@kernel.org To: linux-xfs@vger.kernel.org Subject: [PATCH 04/35] xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h Date: Thu, 15 Feb 2024 13:08:16 +0100 Message-ID: <20240215120907.1542854-5-cem@kernel.org> In-Reply-To: <20240215120907.1542854-1-cem@kernel.org> References: <20240215120907.1542854-1-cem@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	xfsprogs: libxfs-sync for 6.7 \| expand [00/35] xfsprogs: libxfs-sync for 6.7 [01/35] xfs: bump max fsgeom struct version [02/35] xfs: hoist freeing of rt data fork extent mappings [03/35] xfs: fix units conversion error in xfs_bmap_del_extent_delay [04/35] xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h [05/35] xfs: convert xfs_extlen_t to xfs_rtxlen_t in the rt allocator [06/35] xfs: convert rt bitmap/summary block numbers to xfs_fileoff_t [07/35] xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t [08/35] xfs: rename xfs_verify_rtext to xfs_verify_rtbext [09/35] xfs: convert rt extent numbers to xfs_rtxnum_t [10/35] xfs: create a helper to convert rtextents to rtblocks [11/35] xfs: create a helper to compute leftovers of realtime extents [12/35] xfs: create a helper to convert extlen to rtextlen [13/35] xfs: create helpers to convert rt block numbers to rt extent numbers [14/35] xfs: convert do_div calls to xfs_rtb_to_rtx helper calls [15/35] xfs: create rt extent rounding helpers for realtime extent blocks [16/35] xfs: use shifting and masking when converting rt extents, if possible [17/35] xfs: convert the rtbitmap block and bit macros to static inline functions [18/35] xfs: remove XFS_BLOCKWSIZE and XFS_BLOCKWMASK macros [19/35] xfs: convert open-coded xfs_rtword_t pointer accesses to helper [20/35] xfs: convert rt summary macros to helpers [21/35] xfs: convert to new timestamp accessors [22/35] xfs: create helpers for rtbitmap block/wordcount computations [23/35] xfs: create a helper to handle logging parts of rt bitmap/summary blocks [24/35] xfs: use accessor functions for bitmap words [25/35] xfs: create helpers for rtsummary block/wordcount computations [26/35] xfs: use accessor functions for summary info words [27/35] xfs: consolidate realtime allocation arguments [28/35] xfs: cache last bitmap block in realtime allocator [29/35] xfs: simplify xfs_rtbuf_get calling conventions [30/35] xfs: simplify rt bitmap/summary block accessor functions [31/35] xfs: invert the realtime summary cache [32/35] xfs: factor out xfs_defer_pending_abort [33/35] xfs: abort intent items when recovery intents fail [34/35] xfs: fix internal error from AGFL exhaustion [35/35] xfs: inode recovery does not validate the recovered inode

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 21d772cf4..ed437e38e 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -37,6 +37,8 @@ #ifndef __LIBXFS_INTERNAL_XFS_H__ #define __LIBXFS_INTERNAL_XFS_H__ +#define CONFIG_XFS_RT + #include "libxfs_api_defs.h" #include "platform_defs.h" #include "xfs.h" @@ -494,23 +496,6 @@ void xfs_inode_verifier_error(struct xfs_inode *ip, int error, void xfs_buf_corruption_error(struct xfs_buf *bp, xfs_failaddr_t fa); -/* XXX: this is clearly a bug - a shared header needs to export this */ -/* xfs_rtalloc.c */ -int libxfs_rtfree_extent(struct xfs_trans *, xfs_rtblock_t, xfs_extlen_t); -int libxfs_rtfree_blocks(struct xfs_trans *, xfs_fsblock_t, xfs_filblks_t); -bool libxfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno); - -struct xfs_rtalloc_rec { - xfs_rtblock_t ar_startext; - xfs_rtblock_t ar_extcount; -}; - -typedef int (*xfs_rtalloc_query_range_fn)( - struct xfs_mount *mp, - struct xfs_trans *tp, - const struct xfs_rtalloc_rec *rec, - void *priv); - int libxfs_zero_extent(struct xfs_inode *ip, xfs_fsblock_t start_fsb, xfs_off_t count_fsb); @@ -547,43 +532,6 @@ xfs_agnumber_t xfs_set_inode_alloc(struct xfs_mount *mp, xfs_agnumber_t agcount); /* Keep static checkers quiet about nonstatic functions by exporting */ -int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_rtblock_t block, int issum, struct xfs_buf **bpp); -int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_rtblock_t start, xfs_extlen_t len, int val, - xfs_rtblock_t *new, int *stat); -int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_rtblock_t start, xfs_rtblock_t limit, - xfs_rtblock_t *rtblock); -int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_rtblock_t start, xfs_rtblock_t limit, - xfs_rtblock_t *rtblock); -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, - 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, 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, - struct xfs_buf **rbpp, xfs_fsblock_t *rsb); -int xfs_rtalloc_query_range(struct xfs_mount *mp, - struct xfs_trans *tp, - const struct xfs_rtalloc_rec *low_rec, - const struct xfs_rtalloc_rec *high_rec, - xfs_rtalloc_query_range_fn fn, - void *priv); -int xfs_rtalloc_query_all(struct xfs_mount *mp, - struct xfs_trans *tp, - xfs_rtalloc_query_range_fn fn, - void *priv); -bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno); -int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_rtblock_t start, xfs_extlen_t len, - bool *is_free); /* xfs_bmap_util.h */ struct xfs_bmalloca; int xfs_bmap_extsize_align(struct xfs_mount *mp, struct xfs_bmbt_irec *gotp, diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 6fbfcb25a..bc82b71f3 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -29,6 +29,7 @@ #include "xfs_ag.h" #include "xfs_ag_resv.h" #include "xfs_refcount.h" +#include "xfs_rtbitmap.h" struct kmem_cache *xfs_bmap_intent_cache; diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c index 2c20c6538..bd0925c9a 100644 --- a/libxfs/xfs_rtbitmap.c +++ b/libxfs/xfs_rtbitmap.c @@ -14,6 +14,7 @@ #include "xfs_inode.h" #include "xfs_bmap.h" #include "xfs_trans.h" +#include "xfs_rtbitmap.h" /* * Realtime allocator bitmap functions shared with userspace. diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h new file mode 100644 index 000000000..546dea34b --- /dev/null +++ b/libxfs/xfs_rtbitmap.h @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. + * All Rights Reserved. + */ +#ifndef __XFS_RTBITMAP_H__ +#define __XFS_RTBITMAP_H__ + +/* + * XXX: Most of the realtime allocation functions deal in units of realtime + * extents, not realtime blocks. This looks funny when paired with the type + * name and screams for a larger cleanup. + */ +struct xfs_rtalloc_rec { + xfs_rtblock_t ar_startext; + xfs_rtblock_t ar_extcount; +}; + +typedef int (*xfs_rtalloc_query_range_fn)( + struct xfs_mount *mp, + struct xfs_trans *tp, + const struct xfs_rtalloc_rec *rec, + void *priv); + +#ifdef CONFIG_XFS_RT +int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t block, int issum, struct xfs_buf **bpp); +int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t start, xfs_extlen_t len, int val, + xfs_rtblock_t *new, int *stat); +int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t start, xfs_rtblock_t limit, + xfs_rtblock_t *rtblock); +int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t start, xfs_rtblock_t limit, + xfs_rtblock_t *rtblock); +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, + 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, 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, + struct xfs_buf **rbpp, xfs_fsblock_t *rsb); +int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp, + const struct xfs_rtalloc_rec *low_rec, + const struct xfs_rtalloc_rec *high_rec, + xfs_rtalloc_query_range_fn fn, void *priv); +int xfs_rtalloc_query_all(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtalloc_query_range_fn fn, + void *priv); +bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno); +int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t start, xfs_extlen_t len, + bool *is_free); +/* + * Free an extent in the realtime subvolume. Length is expressed in + * realtime extents, as is the block number. + */ +int /* error */ +xfs_rtfree_extent( + struct xfs_trans *tp, /* transaction pointer */ + xfs_rtblock_t bno, /* starting block number to free */ + xfs_extlen_t len); /* length of extent freed */ + +/* Same as above, but in units of rt blocks. */ +int xfs_rtfree_blocks(struct xfs_trans *tp, xfs_fsblock_t rtbno, + xfs_filblks_t rtlen); +#else /* CONFIG_XFS_RT */ +# define xfs_rtfree_extent(t,b,l) (-ENOSYS) +# define xfs_rtfree_blocks(t,rb,rl) (-ENOSYS) +# define xfs_rtalloc_query_range(m,t,l,h,f,p) (-ENOSYS) +# define xfs_rtalloc_query_all(m,t,f,p) (-ENOSYS) +# define xfs_rtbuf_get(m,t,b,i,p) (-ENOSYS) +# define xfs_rtalloc_extent_is_free(m,t,s,l,i) (-ENOSYS) +#endif /* CONFIG_XFS_RT */ + +#endif /* __XFS_RTBITMAP_H__ */

[04/35] xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h

Commit Message

Patch