[12/45] xfs: make the record pointer passed to query_range functions const

Message ID	164263790887.860211.2515446781244435975.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 12/45] xfs: make the record pointer passed to query_range functions const From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org Date: Wed, 19 Jan 2022 16:18:28 -0800 Message-ID: <164263790887.860211.2515446781244435975.stgit@magnolia> In-Reply-To: <164263784199.860211.7509808171577819673.stgit@magnolia> References: <164263784199.860211.7509808171577819673.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	xfsprogs: sync libxfs with 5.15 \| expand [PATCHSET,00/45] xfsprogs: sync libxfs with 5.15 [01/45] xfsprogs: fix static build problems caused by liburcu [02/45] xfs_{copy,db,logprint,repair}: pass xfs_mount pointers instead of xfs_sb pointers [03/45] xfs: remove support for disabling quota accounting on a mounted file system [04/45] xfs: remove the active vs running quota differentiation [05/45] xfs: replace kmem_alloc_large() with kvmalloc() [06/45] xfs: allow setting and clearing of log incompat feature flags [07/45] xfs: add attr state machine tracepoints [08/45] xfs: Rename __xfs_attr_rmtval_remove [09/45] xfs: make xfs_rtalloc_query_range input parameters const [10/45] xfs: make the key parameters to all btree key comparison functions const [11/45] xfs: make the key parameters to all btree query range functions const [12/45] xfs: make the record pointer passed to query_range functions const [13/45] xfs: mark the record passed into btree init_key functions as const [14/45] xfs: make the keys and records passed to btree inorder functions const [15/45] xfs: mark the record passed into xchk_btree functions as const [16/45] xfs: make the pointer passed to btree set_root functions const [17/45] xfs: make the start pointer passed to btree alloc_block functions const [18/45] xfs: make the start pointer passed to btree update_lastrec functions const [19/45] xfs: constify btree function parameters that are not modified [20/45] xfs: resolve fork names in trace output [21/45] xfs: sb verifier doesn't handle uncached sb buffer [22/45] xfs: rename xfs_has_attr() [23/45] xfs: rework attr2 feature and mount options [24/45] xfs: reflect sb features in xfs_mount [25/45] xfs: replace xfs_sb_version checks with feature flag checks [26/45] xfs: convert mount flags to features [27/45] xfs: convert remaining mount flags to state flags [28/45] xfs: replace XFS_FORCED_SHUTDOWN with xfs_is_shutdown [29/45] xfs: convert xfs_fs_geometry to use mount feature checks [30/45] xfs: open code sb verifier feature checks [31/45] xfs: convert xfs_sb_version_has checks to use mount features [32/45] libxlog: replace xfs_sb_version checks with feature flag checks [33/45] libxfs: replace xfs_sb_version checks with feature flag checks [34/45] xfs_{copy,db,logprint,repair}: replace xfs_sb_version checks with feature flag checks [35/45] xfs: remove unused xfs_sb_version_has wrappers [36/45] xfs: introduce xfs_sb_is_v5 helper [37/45] xfs: kill xfs_sb_version_has_v3inode() [38/45] libxfs: use opstate flags and functions for libxfs mount options [39/45] libxfs: remove pointless XFS_MOUNT flags [40/45] libxfs: clean up remaining LIBXFS_MOUNT flags [41/45] libxfs: always initialize internal buffer map [42/45] libxfs: replace XFS_BUF_SET_ADDR with a function [43/45] xfs: introduce xfs_buf_daddr() [44/45] xfs: convert bp->b_bn references to xfs_buf_daddr() [45/45] libxfs: rename buffer cache index variable b_bn

diff --git a/db/fsmap.c b/db/fsmap.c index 65e9f1ba..d30b832c 100644 --- a/db/fsmap.c +++ b/db/fsmap.c @@ -16,11 +16,11 @@ struct fsmap_info { static int fsmap_fn( - struct xfs_btree_cur *cur, - struct xfs_rmap_irec *rec, - void *priv) + struct xfs_btree_cur *cur, + const struct xfs_rmap_irec *rec, + void *priv) { - struct fsmap_info *info = priv; + struct fsmap_info *info = priv; dbprintf(_("%llu: %u/%u len %u owner %lld offset %llu bmbt %d attrfork %d extflag %d\n"), info->nr, info->agno, rec->rm_startblock, diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index 105c90b0..a7c3b079 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -3388,7 +3388,7 @@ struct xfs_alloc_query_range_info { STATIC int xfs_alloc_query_range_helper( struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, void *priv) { struct xfs_alloc_query_range_info *query = priv; diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h index 3554b7d4..e14c5693 100644 --- a/libxfs/xfs_alloc.h +++ b/libxfs/xfs_alloc.h @@ -220,9 +220,9 @@ int xfs_free_extent_fix_freelist(struct xfs_trans *tp, struct xfs_perag *pag, xfs_extlen_t xfs_prealloc_blocks(struct xfs_mount *mp); typedef int (*xfs_alloc_query_range_fn)( - struct xfs_btree_cur *cur, - struct xfs_alloc_rec_incore *rec, - void *priv); + struct xfs_btree_cur *cur, + const struct xfs_alloc_rec_incore *rec, + void *priv); int xfs_alloc_query_range(struct xfs_btree_cur *cur, const struct xfs_alloc_rec_incore *low_rec, diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index aedc62a5..448f6c0d 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -4878,7 +4878,7 @@ xfs_btree_diff_two_ptrs( STATIC int xfs_btree_has_record_helper( struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, void *priv) { return -ECANCELED; diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h index 462c2585..e83836a9 100644 --- a/libxfs/xfs_btree.h +++ b/libxfs/xfs_btree.h @@ -471,7 +471,7 @@ unsigned long long xfs_btree_calc_size(uint *limits, unsigned long long len); * code on its own. */ typedef int (*xfs_btree_query_range_fn)(struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, void *priv); + const union xfs_btree_rec *rec, void *priv); int xfs_btree_query_range(struct xfs_btree_cur *cur, const union xfs_btree_irec *low_rec, diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index 570349b8..c1f3d28a 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -69,7 +69,7 @@ xfs_inobt_update( void xfs_inobt_btrec_to_irec( struct xfs_mount *mp, - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, struct xfs_inobt_rec_incore *irec) { irec->ir_startino = be32_to_cpu(rec->inobt.ir_startino); @@ -2711,7 +2711,7 @@ struct xfs_ialloc_count_inodes { STATIC int xfs_ialloc_count_inodes_rec( struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, void *priv) { struct xfs_inobt_rec_incore irec; diff --git a/libxfs/xfs_ialloc.h b/libxfs/xfs_ialloc.h index 9a2112b4..8b5c2b70 100644 --- a/libxfs/xfs_ialloc.h +++ b/libxfs/xfs_ialloc.h @@ -106,7 +106,8 @@ int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp, xfs_agnumber_t agno, struct xfs_buf **bpp); union xfs_btree_rec; -void xfs_inobt_btrec_to_irec(struct xfs_mount *mp, union xfs_btree_rec *rec, +void xfs_inobt_btrec_to_irec(struct xfs_mount *mp, + const union xfs_btree_rec *rec, struct xfs_inobt_rec_incore *irec); int xfs_ialloc_has_inodes_at_extent(struct xfs_btree_cur *cur, xfs_agblock_t bno, xfs_extlen_t len, bool *exists); diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c index 2ef00c64..1c9e7722 100644 --- a/libxfs/xfs_refcount.c +++ b/libxfs/xfs_refcount.c @@ -90,7 +90,7 @@ xfs_refcount_lookup_eq( /* Convert on-disk record to in-core format. */ void xfs_refcount_btrec_to_irec( - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, struct xfs_refcount_irec *irec) { irec->rc_startblock = be32_to_cpu(rec->refc.rc_startblock); @@ -1653,7 +1653,7 @@ struct xfs_refcount_recovery { STATIC int xfs_refcount_recover_extent( struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, + const union xfs_btree_rec *rec, void *priv) { struct list_head *debris = priv; diff --git a/libxfs/xfs_refcount.h b/libxfs/xfs_refcount.h index 9f6e9aae..02cb3aa4 100644 --- a/libxfs/xfs_refcount.h +++ b/libxfs/xfs_refcount.h @@ -78,7 +78,7 @@ static inline xfs_fileoff_t xfs_refcount_max_unmap(int log_res) extern int xfs_refcount_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno, xfs_extlen_t len, bool *exists); union xfs_btree_rec; -extern void xfs_refcount_btrec_to_irec(union xfs_btree_rec *rec, +extern void xfs_refcount_btrec_to_irec(const union xfs_btree_rec *rec, struct xfs_refcount_irec *irec); extern int xfs_refcount_insert(struct xfs_btree_cur *cur, struct xfs_refcount_irec *irec, int *stat); diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index 100e904d..ed7db353 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -178,8 +178,8 @@ xfs_rmap_delete( /* Convert an internal btree record to an rmap record. */ int xfs_rmap_btrec_to_irec( - union xfs_btree_rec *rec, - struct xfs_rmap_irec *irec) + const union xfs_btree_rec *rec, + struct xfs_rmap_irec *irec) { irec->rm_startblock = be32_to_cpu(rec->rmap.rm_startblock); irec->rm_blockcount = be32_to_cpu(rec->rmap.rm_blockcount); @@ -254,9 +254,9 @@ struct xfs_find_left_neighbor_info { /* For each rmap given, figure out if it matches the key we want. */ STATIC int xfs_rmap_find_left_neighbor_helper( - struct xfs_btree_cur *cur, - struct xfs_rmap_irec *rec, - void *priv) + struct xfs_btree_cur *cur, + const struct xfs_rmap_irec *rec, + void *priv) { struct xfs_find_left_neighbor_info *info = priv; @@ -330,9 +330,9 @@ xfs_rmap_find_left_neighbor( /* For each rmap given, figure out if it matches the key we want. */ STATIC int xfs_rmap_lookup_le_range_helper( - struct xfs_btree_cur *cur, - struct xfs_rmap_irec *rec, - void *priv) + struct xfs_btree_cur *cur, + const struct xfs_rmap_irec *rec, + void *priv) { struct xfs_find_left_neighbor_info *info = priv; @@ -2277,9 +2277,9 @@ struct xfs_rmap_query_range_info { /* Format btree record and pass to our callback. */ STATIC int xfs_rmap_query_range_helper( - struct xfs_btree_cur *cur, - union xfs_btree_rec *rec, - void *priv) + struct xfs_btree_cur *cur, + const union xfs_btree_rec *rec, + void *priv) { struct xfs_rmap_query_range_info *query = priv; struct xfs_rmap_irec irec; @@ -2706,7 +2706,7 @@ struct xfs_rmap_key_state { STATIC int xfs_rmap_has_other_keys_helper( struct xfs_btree_cur *cur, - struct xfs_rmap_irec *rec, + const struct xfs_rmap_irec *rec, void *priv) { struct xfs_rmap_key_state *rks = priv; diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h index 1354efc4..fd67904e 100644 --- a/libxfs/xfs_rmap.h +++ b/libxfs/xfs_rmap.h @@ -134,9 +134,9 @@ int xfs_rmap_get_rec(struct xfs_btree_cur *cur, struct xfs_rmap_irec *irec, int *stat); typedef int (*xfs_rmap_query_range_fn)( - struct xfs_btree_cur *cur, - struct xfs_rmap_irec *rec, - void *priv); + struct xfs_btree_cur *cur, + const struct xfs_rmap_irec *rec, + void *priv); int xfs_rmap_query_range(struct xfs_btree_cur *cur, const struct xfs_rmap_irec *low_rec, @@ -193,7 +193,7 @@ int xfs_rmap_lookup_le_range(struct xfs_btree_cur *cur, xfs_agblock_t bno, int xfs_rmap_compare(const struct xfs_rmap_irec *a, const struct xfs_rmap_irec *b); union xfs_btree_rec; -int xfs_rmap_btrec_to_irec(union xfs_btree_rec *rec, +int xfs_rmap_btrec_to_irec(const union xfs_btree_rec *rec, struct xfs_rmap_irec *irec); int xfs_rmap_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno, xfs_extlen_t len, bool *exists);

[12/45] xfs: make the record pointer passed to query_range functions const

Commit Message

Patch