From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 05/13] xfs: plumb in needed functions for range querying of various btrees
Date: Tue, 6 Jun 2017 09:33:04 -0400 [thread overview]
Message-ID: <20170606133302.GD51630@bfoster.bfoster> (raw)
In-Reply-To: <149643867088.23065.12909617449604566367.stgit@birch.djwong.org>
On Fri, Jun 02, 2017 at 02:24:30PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Plumb in the pieces (init_high_key, diff_two_keys) necessary to call
> query_range on the inode space and block mapping btrees and to extract
> raw btree records. This will eventually be used by the inobt and bmbt
> scrubbers.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_bmap_btree.c | 22 ++++++++++++++++++++++
> fs/xfs/libxfs/xfs_ialloc_btree.c | 26 ++++++++++++++++++++++++++
> 2 files changed, 48 insertions(+)
>
>
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
> index e23495e..85de225 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.c
> @@ -573,6 +573,16 @@ xfs_bmbt_init_key_from_rec(
> }
>
> STATIC void
> +xfs_bmbt_init_high_key_from_rec(
> + union xfs_btree_key *key,
> + union xfs_btree_rec *rec)
> +{
> + key->bmbt.br_startoff = cpu_to_be64(
> + xfs_bmbt_disk_get_startoff(&rec->bmbt) +
> + xfs_bmbt_disk_get_blockcount(&rec->bmbt) - 1);
> +}
> +
> +STATIC void
> xfs_bmbt_init_rec_from_cur(
> struct xfs_btree_cur *cur,
> union xfs_btree_rec *rec)
> @@ -597,6 +607,16 @@ xfs_bmbt_key_diff(
> cur->bc_rec.b.br_startoff;
> }
>
> +STATIC int64_t
> +xfs_bmbt_diff_two_keys(
> + struct xfs_btree_cur *cur,
> + union xfs_btree_key *k1,
> + union xfs_btree_key *k2)
> +{
> + return (int64_t)be64_to_cpu(k1->bmbt.br_startoff) -
> + be64_to_cpu(k2->bmbt.br_startoff);
> +}
> +
> static bool
> xfs_bmbt_verify(
> struct xfs_buf *bp)
> @@ -720,9 +740,11 @@ static const struct xfs_btree_ops xfs_bmbt_ops = {
> .get_minrecs = xfs_bmbt_get_minrecs,
> .get_dmaxrecs = xfs_bmbt_get_dmaxrecs,
> .init_key_from_rec = xfs_bmbt_init_key_from_rec,
> + .init_high_key_from_rec = xfs_bmbt_init_high_key_from_rec,
> .init_rec_from_cur = xfs_bmbt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_bmbt_init_ptr_from_cur,
> .key_diff = xfs_bmbt_key_diff,
> + .diff_two_keys = xfs_bmbt_diff_two_keys,
> .buf_ops = &xfs_bmbt_buf_ops,
> .keys_inorder = xfs_bmbt_keys_inorder,
> .recs_inorder = xfs_bmbt_recs_inorder,
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
> index 6b1ddeb..317caba 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
> @@ -175,6 +175,18 @@ xfs_inobt_init_key_from_rec(
> }
>
> STATIC void
> +xfs_inobt_init_high_key_from_rec(
> + union xfs_btree_key *key,
> + union xfs_btree_rec *rec)
> +{
> + __u32 x;
> +
> + x = be32_to_cpu(rec->inobt.ir_startino);
> + x += XFS_INODES_PER_CHUNK - 1;
> + key->inobt.ir_startino = cpu_to_be32(x);
> +}
> +
> +STATIC void
> xfs_inobt_init_rec_from_cur(
> struct xfs_btree_cur *cur,
> union xfs_btree_rec *rec)
> @@ -228,6 +240,16 @@ xfs_inobt_key_diff(
> cur->bc_rec.i.ir_startino;
> }
>
> +STATIC int64_t
> +xfs_inobt_diff_two_keys(
> + struct xfs_btree_cur *cur,
> + union xfs_btree_key *k1,
> + union xfs_btree_key *k2)
> +{
> + return (int64_t)be32_to_cpu(k1->inobt.ir_startino) -
> + be32_to_cpu(k2->inobt.ir_startino);
> +}
> +
> static int
> xfs_inobt_verify(
> struct xfs_buf *bp)
> @@ -333,10 +355,12 @@ static const struct xfs_btree_ops xfs_inobt_ops = {
> .get_minrecs = xfs_inobt_get_minrecs,
> .get_maxrecs = xfs_inobt_get_maxrecs,
> .init_key_from_rec = xfs_inobt_init_key_from_rec,
> + .init_high_key_from_rec = xfs_inobt_init_high_key_from_rec,
> .init_rec_from_cur = xfs_inobt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_inobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
> .buf_ops = &xfs_inobt_buf_ops,
> + .diff_two_keys = xfs_inobt_diff_two_keys,
> .keys_inorder = xfs_inobt_keys_inorder,
> .recs_inorder = xfs_inobt_recs_inorder,
> };
> @@ -352,10 +376,12 @@ static const struct xfs_btree_ops xfs_finobt_ops = {
> .get_minrecs = xfs_inobt_get_minrecs,
> .get_maxrecs = xfs_inobt_get_maxrecs,
> .init_key_from_rec = xfs_inobt_init_key_from_rec,
> + .init_high_key_from_rec = xfs_inobt_init_high_key_from_rec,
> .init_rec_from_cur = xfs_inobt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_finobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
> .buf_ops = &xfs_inobt_buf_ops,
> + .diff_two_keys = xfs_inobt_diff_two_keys,
> .keys_inorder = xfs_inobt_keys_inorder,
> .recs_inorder = xfs_inobt_recs_inorder,
> };
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-06-06 13:33 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 21:24 [PATCH v7 00/13] xfs: preparing for online scrub support Darrick J. Wong
2017-06-02 21:24 ` [PATCH 01/13] xfs: optimize _btree_query_all Darrick J. Wong
2017-06-06 13:32 ` Brian Foster
2017-06-06 17:43 ` Darrick J. Wong
2017-06-07 1:18 ` [PATCH v2 " Darrick J. Wong
2017-06-07 14:22 ` Brian Foster
2017-06-02 21:24 ` [PATCH 02/13] xfs: remove double-underscore integer types Darrick J. Wong
2017-06-02 21:24 ` [PATCH 03/13] xfs: always compile the btree inorder check functions Darrick J. Wong
2017-06-06 13:32 ` Brian Foster
2017-06-02 21:24 ` [PATCH 04/13] xfs: export various function for the online scrubber Darrick J. Wong
2017-06-06 13:32 ` Brian Foster
2017-06-02 21:24 ` [PATCH 05/13] xfs: plumb in needed functions for range querying of various btrees Darrick J. Wong
2017-06-06 13:33 ` Brian Foster [this message]
2017-06-02 21:24 ` [PATCH 06/13] xfs: export _inobt_btrec_to_irec and _ialloc_cluster_alignment for scrub Darrick J. Wong
2017-06-06 16:27 ` Brian Foster
2017-06-06 17:46 ` Darrick J. Wong
2017-06-02 21:24 ` [PATCH 07/13] xfs: check if an inode is cached and allocated Darrick J. Wong
2017-06-06 16:28 ` Brian Foster
2017-06-06 18:40 ` Darrick J. Wong
2017-06-07 14:22 ` Brian Foster
2017-06-15 5:00 ` Darrick J. Wong
2017-06-07 1:21 ` [PATCH v2 " Darrick J. Wong
2017-06-16 17:59 ` [PATCH v3 " Darrick J. Wong
2017-06-19 12:07 ` Brian Foster
2017-06-02 21:24 ` [PATCH 08/13] xfs: reflink find shared should take a transaction Darrick J. Wong
2017-06-06 16:28 ` Brian Foster
2017-06-02 21:24 ` [PATCH 09/13] xfs: separate function to check if reflink flag needed Darrick J. Wong
2017-06-06 16:28 ` Brian Foster
2017-06-06 18:05 ` Darrick J. Wong
2017-06-07 1:26 ` [PATCH v2 " Darrick J. Wong
2017-06-07 14:22 ` Brian Foster
2017-06-02 21:25 ` [PATCH 10/13] xfs: refactor the ifork block counting function Darrick J. Wong
2017-06-06 16:29 ` Brian Foster
2017-06-06 18:51 ` Darrick J. Wong
2017-06-06 20:35 ` Darrick J. Wong
2017-06-07 1:29 ` [PATCH v2 9.9/13] xfs: make _bmap_count_blocks consistent wrt delalloc extent behavior Darrick J. Wong
2017-06-07 15:11 ` Brian Foster
2017-06-07 16:19 ` Darrick J. Wong
2017-06-07 1:29 ` [PATCH v2 10/13] xfs: refactor the ifork block counting function Darrick J. Wong
2017-06-07 15:11 ` Brian Foster
2017-06-02 21:25 ` [PATCH 11/13] xfs: return the hash value of a leaf1 directory block Darrick J. Wong
2017-06-08 13:02 ` Brian Foster
2017-06-08 15:53 ` Darrick J. Wong
2017-06-08 16:31 ` Brian Foster
2017-06-08 16:43 ` Darrick J. Wong
2017-06-08 16:52 ` Brian Foster
2017-06-08 18:22 ` [PATCH v2 " Darrick J. Wong
2017-06-09 12:54 ` Brian Foster
2017-06-02 21:25 ` [PATCH 12/13] xfs: pass along transaction context when reading directory block buffers Darrick J. Wong
2017-06-08 13:02 ` Brian Foster
2017-06-02 21:25 ` [PATCH 13/13] xfs: pass along transaction context when reading xattr " Darrick J. Wong
2017-06-08 13:02 ` Brian Foster
2017-06-02 22:19 ` [PATCH 14/13] xfs: allow reading of already-locked remote symbolic link Darrick J. Wong
2017-06-08 13:02 ` Brian Foster
2017-06-26 6:04 ` [PATCH 15/13] xfs: grab dquots without taking the ilock Darrick J. Wong
2017-06-27 11:00 ` Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170606133302.GD51630@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).