mirror of
https://github.com/torvalds/linux
synced 2024-10-02 01:10:22 +00:00
xfs: fix xfs_btree_query_range callers to initialize btree rec fully
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>
This commit is contained in:
parent
3ee9351e74
commit
75dc034531
|
@ -3823,15 +3823,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);
|
||||
}
|
||||
|
|
|
@ -1921,8 +1921,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;
|
||||
|
||||
|
@ -1953,10 +1958,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);
|
||||
|
|
|
@ -2389,14 +2389,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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue