diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2023-09-06 13:53:48 +0200 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2023-09-07 11:55:50 +0200 |
| commit | 05dcea079c30819909d513b488659a5fe2e876a2 (patch) | |
| tree | cc1afbccf63840d7c2b957528e5ce90ce559ec7f | |
| parent | d096b26c33a858ad88db98306057da67e6d18611 (diff) | |
| download | xfsprogs-dev-05dcea079c30819909d513b488659a5fe2e876a2.tar.gz | |
xfs: fix xfs_btree_query_range callers to initialize btree rec fully
Source kernel commit: 75dc0345312221971903b2e28279b7e24b7dbb1b
Use struct initializers to ensure that the xfs_btree_irecs passed into
the query_range function are completely initialized. No functional
changes, just closing some sloppy hygiene.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
| -rw-r--r-- | libxfs/xfs_alloc.c | 10 | ||||
| -rw-r--r-- | libxfs/xfs_refcount.c | 13 | ||||
| -rw-r--r-- | libxfs/xfs_rmap.c | 10 |
3 files changed, 13 insertions, 20 deletions
diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index b074d3fa1b..a66a8b8c38 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -3819,15 +3819,11 @@ xfs_alloc_query_range( xfs_alloc_query_range_fn fn, void *priv) { - union xfs_btree_irec low_brec; - union xfs_btree_irec high_brec; - struct xfs_alloc_query_range_info query; + union xfs_btree_irec low_brec = { .a = *low_rec }; + union xfs_btree_irec high_brec = { .a = *high_rec }; + struct xfs_alloc_query_range_info query = { .priv = priv, .fn = fn }; ASSERT(cur->bc_btnum == XFS_BTNUM_BNO); - low_brec.a = *low_rec; - high_brec.a = *high_rec; - query.priv = priv; - query.fn = fn; return xfs_btree_query_range(cur, &low_brec, &high_brec, xfs_alloc_query_range_helper, &query); } diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c index 8f30dc196e..ae72f25077 100644 --- a/libxfs/xfs_refcount.c +++ b/libxfs/xfs_refcount.c @@ -1920,8 +1920,13 @@ xfs_refcount_recover_cow_leftovers( struct xfs_buf *agbp; struct xfs_refcount_recovery *rr, *n; struct list_head debris; - union xfs_btree_irec low; - union xfs_btree_irec high; + union xfs_btree_irec low = { + .rc.rc_domain = XFS_REFC_DOMAIN_COW, + }; + union xfs_btree_irec high = { + .rc.rc_domain = XFS_REFC_DOMAIN_COW, + .rc.rc_startblock = -1U, + }; xfs_fsblock_t fsb; int error; @@ -1952,10 +1957,6 @@ xfs_refcount_recover_cow_leftovers( cur = xfs_refcountbt_init_cursor(mp, tp, agbp, pag); /* Find all the leftover CoW staging extents. */ - memset(&low, 0, sizeof(low)); - memset(&high, 0, sizeof(high)); - low.rc.rc_domain = high.rc.rc_domain = XFS_REFC_DOMAIN_COW; - high.rc.rc_startblock = -1U; error = xfs_btree_query_range(cur, &low, &high, xfs_refcount_recover_extent, &debris); xfs_btree_del_cursor(cur, error); diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index 4c01dda75b..5ff6d7a32f 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -2388,14 +2388,10 @@ xfs_rmap_query_range( xfs_rmap_query_range_fn fn, void *priv) { - union xfs_btree_irec low_brec; - union xfs_btree_irec high_brec; - struct xfs_rmap_query_range_info query; + union xfs_btree_irec low_brec = { .r = *low_rec }; + union xfs_btree_irec high_brec = { .r = *high_rec }; + struct xfs_rmap_query_range_info query = { .priv = priv, .fn = fn }; - low_brec.r = *low_rec; - high_brec.r = *high_rec; - query.priv = priv; - query.fn = fn; return xfs_btree_query_range(cur, &low_brec, &high_brec, xfs_rmap_query_range_helper, &query); } |