From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 03/13] xfs: always compile the btree inorder check functions
Date: Tue, 6 Jun 2017 09:32:52 -0400 [thread overview]
Message-ID: <20170606133250.GB51630@bfoster.bfoster> (raw)
In-Reply-To: <149643865870.23065.16385676974970966766.stgit@birch.djwong.org>
On Fri, Jun 02, 2017 at 02:24:18PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The btree record and key inorder check functions will be used by the
> btree scrubber code, so make sure they're always built.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_alloc_btree.c | 6 ------
> fs/xfs/libxfs/xfs_bmap_btree.c | 4 ----
> fs/xfs/libxfs/xfs_btree.h | 2 --
> fs/xfs/libxfs/xfs_ialloc_btree.c | 6 ------
> fs/xfs/libxfs/xfs_refcount_btree.c | 4 ----
> fs/xfs/libxfs/xfs_rmap_btree.c | 4 ----
> 6 files changed, 26 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
> index 5020cbc..cfde0a0 100644
> --- a/fs/xfs/libxfs/xfs_alloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_alloc_btree.c
> @@ -395,7 +395,6 @@ const struct xfs_buf_ops xfs_allocbt_buf_ops = {
> };
>
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> STATIC int
> xfs_bnobt_keys_inorder(
> struct xfs_btree_cur *cur,
> @@ -442,7 +441,6 @@ xfs_cntbt_recs_inorder(
> be32_to_cpu(r1->alloc.ar_startblock) <
> be32_to_cpu(r2->alloc.ar_startblock));
> }
> -#endif /* DEBUG */
>
> static const struct xfs_btree_ops xfs_bnobt_ops = {
> .rec_len = sizeof(xfs_alloc_rec_t),
> @@ -462,10 +460,8 @@ static const struct xfs_btree_ops xfs_bnobt_ops = {
> .key_diff = xfs_bnobt_key_diff,
> .buf_ops = &xfs_allocbt_buf_ops,
> .diff_two_keys = xfs_bnobt_diff_two_keys,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_bnobt_keys_inorder,
> .recs_inorder = xfs_bnobt_recs_inorder,
> -#endif
> };
>
> static const struct xfs_btree_ops xfs_cntbt_ops = {
> @@ -486,10 +482,8 @@ static const struct xfs_btree_ops xfs_cntbt_ops = {
> .key_diff = xfs_cntbt_key_diff,
> .buf_ops = &xfs_allocbt_buf_ops,
> .diff_two_keys = xfs_cntbt_diff_two_keys,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_cntbt_keys_inorder,
> .recs_inorder = xfs_cntbt_recs_inorder,
> -#endif
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
> index 5e2b3dc..e23495e 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.c
> @@ -687,7 +687,6 @@ const struct xfs_buf_ops xfs_bmbt_buf_ops = {
> };
>
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> STATIC int
> xfs_bmbt_keys_inorder(
> struct xfs_btree_cur *cur,
> @@ -708,7 +707,6 @@ xfs_bmbt_recs_inorder(
> xfs_bmbt_disk_get_blockcount(&r1->bmbt) <=
> xfs_bmbt_disk_get_startoff(&r2->bmbt);
> }
> -#endif /* DEBUG */
>
> static const struct xfs_btree_ops xfs_bmbt_ops = {
> .rec_len = sizeof(xfs_bmbt_rec_t),
> @@ -726,10 +724,8 @@ static const struct xfs_btree_ops xfs_bmbt_ops = {
> .init_ptr_from_cur = xfs_bmbt_init_ptr_from_cur,
> .key_diff = xfs_bmbt_key_diff,
> .buf_ops = &xfs_bmbt_buf_ops,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_bmbt_keys_inorder,
> .recs_inorder = xfs_bmbt_recs_inorder,
> -#endif
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 0a931f6..177a364 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -163,7 +163,6 @@ struct xfs_btree_ops {
>
> const struct xfs_buf_ops *buf_ops;
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> /* check that k1 is lower than k2 */
> int (*keys_inorder)(struct xfs_btree_cur *cur,
> union xfs_btree_key *k1,
> @@ -173,7 +172,6 @@ struct xfs_btree_ops {
> int (*recs_inorder)(struct xfs_btree_cur *cur,
> union xfs_btree_rec *r1,
> union xfs_btree_rec *r2);
> -#endif
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
> index ed52d99..6b1ddeb 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
> @@ -302,7 +302,6 @@ const struct xfs_buf_ops xfs_inobt_buf_ops = {
> .verify_write = xfs_inobt_write_verify,
> };
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> STATIC int
> xfs_inobt_keys_inorder(
> struct xfs_btree_cur *cur,
> @@ -322,7 +321,6 @@ xfs_inobt_recs_inorder(
> return be32_to_cpu(r1->inobt.ir_startino) + XFS_INODES_PER_CHUNK <=
> be32_to_cpu(r2->inobt.ir_startino);
> }
> -#endif /* DEBUG */
>
> static const struct xfs_btree_ops xfs_inobt_ops = {
> .rec_len = sizeof(xfs_inobt_rec_t),
> @@ -339,10 +337,8 @@ static const struct xfs_btree_ops xfs_inobt_ops = {
> .init_ptr_from_cur = xfs_inobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
> .buf_ops = &xfs_inobt_buf_ops,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_inobt_keys_inorder,
> .recs_inorder = xfs_inobt_recs_inorder,
> -#endif
> };
>
> static const struct xfs_btree_ops xfs_finobt_ops = {
> @@ -360,10 +356,8 @@ static const struct xfs_btree_ops xfs_finobt_ops = {
> .init_ptr_from_cur = xfs_finobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
> .buf_ops = &xfs_inobt_buf_ops,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_inobt_keys_inorder,
> .recs_inorder = xfs_inobt_recs_inorder,
> -#endif
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c
> index 65c222a..3c59dd3 100644
> --- a/fs/xfs/libxfs/xfs_refcount_btree.c
> +++ b/fs/xfs/libxfs/xfs_refcount_btree.c
> @@ -285,7 +285,6 @@ const struct xfs_buf_ops xfs_refcountbt_buf_ops = {
> .verify_write = xfs_refcountbt_write_verify,
> };
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> STATIC int
> xfs_refcountbt_keys_inorder(
> struct xfs_btree_cur *cur,
> @@ -306,7 +305,6 @@ xfs_refcountbt_recs_inorder(
> be32_to_cpu(r1->refc.rc_blockcount) <=
> be32_to_cpu(r2->refc.rc_startblock);
> }
> -#endif
>
> static const struct xfs_btree_ops xfs_refcountbt_ops = {
> .rec_len = sizeof(struct xfs_refcount_rec),
> @@ -325,10 +323,8 @@ static const struct xfs_btree_ops xfs_refcountbt_ops = {
> .key_diff = xfs_refcountbt_key_diff,
> .buf_ops = &xfs_refcountbt_buf_ops,
> .diff_two_keys = xfs_refcountbt_diff_two_keys,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_refcountbt_keys_inorder,
> .recs_inorder = xfs_refcountbt_recs_inorder,
> -#endif
> };
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
> index c5b4a1c8..9d9c919 100644
> --- a/fs/xfs/libxfs/xfs_rmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_rmap_btree.c
> @@ -377,7 +377,6 @@ const struct xfs_buf_ops xfs_rmapbt_buf_ops = {
> .verify_write = xfs_rmapbt_write_verify,
> };
>
> -#if defined(DEBUG) || defined(XFS_WARN)
> STATIC int
> xfs_rmapbt_keys_inorder(
> struct xfs_btree_cur *cur,
> @@ -437,7 +436,6 @@ xfs_rmapbt_recs_inorder(
> return 1;
> return 0;
> }
> -#endif /* DEBUG */
>
> static const struct xfs_btree_ops xfs_rmapbt_ops = {
> .rec_len = sizeof(struct xfs_rmap_rec),
> @@ -456,10 +454,8 @@ static const struct xfs_btree_ops xfs_rmapbt_ops = {
> .key_diff = xfs_rmapbt_key_diff,
> .buf_ops = &xfs_rmapbt_buf_ops,
> .diff_two_keys = xfs_rmapbt_diff_two_keys,
> -#if defined(DEBUG) || defined(XFS_WARN)
> .keys_inorder = xfs_rmapbt_keys_inorder,
> .recs_inorder = xfs_rmapbt_recs_inorder,
> -#endif
> };
>
> /*
>
> --
> 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:32 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 [this message]
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
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=20170606133250.GB51630@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.