From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v2 11/13] xfs: return the hash value of a leaf1 directory block
Date: Fri, 9 Jun 2017 08:54:15 -0400 [thread overview]
Message-ID: <20170609125414.GB10685@bfoster.bfoster> (raw)
In-Reply-To: <20170608182236.GL4530@birch.djwong.org>
On Thu, Jun 08, 2017 at 11:22:36AM -0700, Darrick J. Wong wrote:
> Modify the existing dir leafn lasthash function to enable us to
> calculate the highest hash value of a leaf1 block. This will be used by
> the directory scrubbing code to check the sanity of hashes in leaf1
> directory blocks.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Thanks for the update..
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_da_btree.c | 10 +++++-----
> fs/xfs/libxfs/xfs_dir2_node.c | 10 ++++++----
> fs/xfs/libxfs/xfs_dir2_priv.h | 2 +-
> 3 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
> index 48f1136..356f21d 100644
> --- a/fs/xfs/libxfs/xfs_da_btree.c
> +++ b/fs/xfs/libxfs/xfs_da_btree.c
> @@ -1282,7 +1282,7 @@ xfs_da3_fixhashpath(
> return;
> break;
> case XFS_DIR2_LEAFN_MAGIC:
> - lasthash = xfs_dir2_leafn_lasthash(dp, blk->bp, &count);
> + lasthash = xfs_dir2_leaf_lasthash(dp, blk->bp, &count);
> if (count == 0)
> return;
> break;
> @@ -1502,8 +1502,8 @@ xfs_da3_node_lookup_int(
> if (blk->magic == XFS_DIR2_LEAFN_MAGIC ||
> blk->magic == XFS_DIR3_LEAFN_MAGIC) {
> blk->magic = XFS_DIR2_LEAFN_MAGIC;
> - blk->hashval = xfs_dir2_leafn_lasthash(args->dp,
> - blk->bp, NULL);
> + blk->hashval = xfs_dir2_leaf_lasthash(args->dp,
> + blk->bp, NULL);
> break;
> }
>
> @@ -1929,8 +1929,8 @@ xfs_da3_path_shift(
> blk->magic = XFS_DIR2_LEAFN_MAGIC;
> ASSERT(level == path->active-1);
> blk->index = 0;
> - blk->hashval = xfs_dir2_leafn_lasthash(args->dp,
> - blk->bp, NULL);
> + blk->hashval = xfs_dir2_leaf_lasthash(args->dp,
> + blk->bp, NULL);
> break;
> default:
> ASSERT(0);
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index bbd1238..682e2bf 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -528,7 +528,7 @@ xfs_dir2_free_hdr_check(
> * Stale entries are ok.
> */
> xfs_dahash_t /* hash value */
> -xfs_dir2_leafn_lasthash(
> +xfs_dir2_leaf_lasthash(
> struct xfs_inode *dp,
> struct xfs_buf *bp, /* leaf buffer */
> int *count) /* count of entries in leaf */
> @@ -540,7 +540,9 @@ xfs_dir2_leafn_lasthash(
> dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf);
>
> ASSERT(leafhdr.magic == XFS_DIR2_LEAFN_MAGIC ||
> - leafhdr.magic == XFS_DIR3_LEAFN_MAGIC);
> + leafhdr.magic == XFS_DIR3_LEAFN_MAGIC ||
> + leafhdr.magic == XFS_DIR2_LEAF1_MAGIC ||
> + leafhdr.magic == XFS_DIR3_LEAF1_MAGIC);
>
> if (count)
> *count = leafhdr.count;
> @@ -1405,8 +1407,8 @@ xfs_dir2_leafn_split(
> /*
> * Update last hashval in each block since we added the name.
> */
> - oldblk->hashval = xfs_dir2_leafn_lasthash(dp, oldblk->bp, NULL);
> - newblk->hashval = xfs_dir2_leafn_lasthash(dp, newblk->bp, NULL);
> + oldblk->hashval = xfs_dir2_leaf_lasthash(dp, oldblk->bp, NULL);
> + newblk->hashval = xfs_dir2_leaf_lasthash(dp, newblk->bp, NULL);
> xfs_dir3_leaf_check(dp, oldblk->bp);
> xfs_dir3_leaf_check(dp, newblk->bp);
> return error;
> diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
> index 576f2d2..6d24209 100644
> --- a/fs/xfs/libxfs/xfs_dir2_priv.h
> +++ b/fs/xfs/libxfs/xfs_dir2_priv.h
> @@ -95,7 +95,7 @@ extern bool xfs_dir3_leaf_check_int(struct xfs_mount *mp, struct xfs_inode *dp,
> /* xfs_dir2_node.c */
> extern int xfs_dir2_leaf_to_node(struct xfs_da_args *args,
> struct xfs_buf *lbp);
> -extern xfs_dahash_t xfs_dir2_leafn_lasthash(struct xfs_inode *dp,
> +extern xfs_dahash_t xfs_dir2_leaf_lasthash(struct xfs_inode *dp,
> struct xfs_buf *bp, int *count);
> extern int xfs_dir2_leafn_lookup_int(struct xfs_buf *bp,
> struct xfs_da_args *args, int *indexp,
> --
> 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-09 12:54 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
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 [this message]
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=20170609125414.GB10685@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).