From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 03/16] xfs: kill XFS_DIR2...FIRSTDB macros
Date: Fri, 23 May 2014 15:05:27 -0400 [thread overview]
Message-ID: <20140523190526.GD8343@laptop.bfoster> (raw)
In-Reply-To: <1400803432-20048-4-git-send-email-david@fromorbit.com>
On Fri, May 23, 2014 at 10:03:39AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> They are just simple wrappers around xfs_dir2_byte_to_db(), and
> we've already removed one usage earlier in the patch set. Kill
> the rest before we start removing the xfs_mount from conversion
> functions.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_da_format.c | 6 ++++--
> fs/xfs/xfs_da_format.h | 6 ------
> fs/xfs/xfs_dir2.c | 2 +-
> fs/xfs/xfs_dir2_leaf.c | 9 +++++----
> fs/xfs/xfs_dir2_node.c | 11 +++++++----
> 5 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/fs/xfs/xfs_da_format.c b/fs/xfs/xfs_da_format.c
> index 22bbc79..313eea3 100644
> --- a/fs/xfs/xfs_da_format.c
> +++ b/fs/xfs/xfs_da_format.c
> @@ -610,7 +610,8 @@ xfs_dir2_free_bests_p(struct xfs_dir2_free *free)
> static xfs_dir2_db_t
> xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db)
> {
> - return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir2_free_max_bests(mp);
> + return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +
> + (db / xfs_dir2_free_max_bests(mp));
> }
>
> /*
> @@ -641,7 +642,8 @@ xfs_dir3_free_bests_p(struct xfs_dir2_free *free)
> static xfs_dir2_db_t
> xfs_dir3_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db)
> {
> - return XFS_DIR2_FREE_FIRSTDB(mp) + db / xfs_dir3_free_max_bests(mp);
> + return xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET) +
> + (db / xfs_dir3_free_max_bests(mp));
> }
>
> /*
> diff --git a/fs/xfs/xfs_da_format.h b/fs/xfs/xfs_da_format.h
> index 32b415c..44d7fac 100644
> --- a/fs/xfs/xfs_da_format.h
> +++ b/fs/xfs/xfs_da_format.h
> @@ -330,8 +330,6 @@ xfs_dir2_sf_firstentry(struct xfs_dir2_sf_hdr *hdr)
> #define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG))
> #define XFS_DIR2_DATA_SPACE 0
> #define XFS_DIR2_DATA_OFFSET (XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE)
> -#define XFS_DIR2_DATA_FIRSTDB(mp) \
> - xfs_dir2_byte_to_db(mp, XFS_DIR2_DATA_OFFSET)
>
> /*
> * Describe a free area in the data block.
> @@ -456,8 +454,6 @@ xfs_dir2_data_unused_tag_p(struct xfs_dir2_data_unused *dup)
> */
> #define XFS_DIR2_LEAF_SPACE 1
> #define XFS_DIR2_LEAF_OFFSET (XFS_DIR2_LEAF_SPACE * XFS_DIR2_SPACE_SIZE)
> -#define XFS_DIR2_LEAF_FIRSTDB(mp) \
> - xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET)
>
> /*
> * Leaf block header.
> @@ -531,8 +527,6 @@ xfs_dir2_leaf_bests_p(struct xfs_dir2_leaf_tail *ltp)
> */
> #define XFS_DIR2_FREE_SPACE 2
> #define XFS_DIR2_FREE_OFFSET (XFS_DIR2_FREE_SPACE * XFS_DIR2_SPACE_SIZE)
> -#define XFS_DIR2_FREE_FIRSTDB(mp) \
> - xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET)
>
> typedef struct xfs_dir2_free_hdr {
> __be32 magic; /* XFS_DIR2_FREE_MAGIC */
> diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
> index 16c3c4b..1268dae 100644
> --- a/fs/xfs/xfs_dir2.c
> +++ b/fs/xfs/xfs_dir2.c
> @@ -736,7 +736,7 @@ xfs_dir2_shrink_inode(
> /*
> * If it's not a data block, we're done.
> */
> - if (db >= XFS_DIR2_LEAF_FIRSTDB(mp))
> + if (db >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET))
> return 0;
> /*
> * If the block isn't the last one in the directory, we're done.
> diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
> index f571723..dc4ef19 100644
> --- a/fs/xfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/xfs_dir2_leaf.c
> @@ -347,8 +347,8 @@ xfs_dir3_leaf_get_buf(
> int error;
>
> ASSERT(magic == XFS_DIR2_LEAF1_MAGIC || magic == XFS_DIR2_LEAFN_MAGIC);
> - ASSERT(bno >= XFS_DIR2_LEAF_FIRSTDB(mp) &&
> - bno < XFS_DIR2_FREE_FIRSTDB(mp));
> + ASSERT(bno >= xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET) &&
> + bno < xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET));
>
> error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(mp, bno), -1, &bp,
> XFS_DATA_FORK);
> @@ -404,7 +404,7 @@ xfs_dir2_block_to_leaf(
> return error;
> }
> ldb = xfs_dir2_da_to_db(mp, blkno);
> - ASSERT(ldb == XFS_DIR2_LEAF_FIRSTDB(mp));
> + ASSERT(ldb == xfs_dir2_byte_to_db(mp, XFS_DIR2_LEAF_OFFSET));
> /*
> * Initialize the leaf block, get a buffer for it.
> */
> @@ -1798,7 +1798,8 @@ xfs_dir2_node_to_leaf(
> /*
> * Get rid of the freespace block.
> */
> - error = xfs_dir2_shrink_inode(args, XFS_DIR2_FREE_FIRSTDB(mp), fbp);
> + error = xfs_dir2_shrink_inode(args,
> + xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET), fbp);
> if (error) {
> /*
> * This can't fail here because it can only happen when
> diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
> index 9cb91ee..1bcaaa0 100644
> --- a/fs/xfs/xfs_dir2_node.c
> +++ b/fs/xfs/xfs_dir2_node.c
> @@ -315,7 +315,7 @@ xfs_dir2_leaf_to_node(
> if ((error = xfs_dir2_grow_inode(args, XFS_DIR2_FREE_SPACE, &fdb))) {
> return error;
> }
> - ASSERT(fdb == XFS_DIR2_FREE_FIRSTDB(mp));
> + ASSERT(fdb == xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET));
> /*
> * Get the buffer for the new freespace block.
> */
> @@ -1256,7 +1256,7 @@ xfs_dir2_leafn_remove(
> struct xfs_dir3_icfree_hdr freehdr;
> dp->d_ops->free_hdr_from_disk(&freehdr, free);
> ASSERT(freehdr.firstdb == dp->d_ops->free_max_bests(mp) *
> - (fdb - XFS_DIR2_FREE_FIRSTDB(mp)));
> + (fdb - xfs_dir2_byte_to_db(mp, XFS_DIR2_FREE_OFFSET)));
> }
> #endif
> /*
> @@ -1747,7 +1747,8 @@ xfs_dir2_node_addname_int(
> * us a freespace block to start with.
> */
> if (++fbno == 0)
> - fbno = XFS_DIR2_FREE_FIRSTDB(mp);
> + fbno = xfs_dir2_byte_to_db(mp,
> + XFS_DIR2_FREE_OFFSET);
> /*
> * If it's ifbno we already looked at it.
> */
> @@ -1887,7 +1888,9 @@ xfs_dir2_node_addname_int(
> /*
> * Remember the first slot as our empty slot.
> */
> - freehdr.firstdb = (fbno - XFS_DIR2_FREE_FIRSTDB(mp)) *
> + freehdr.firstdb =
> + (fbno - xfs_dir2_byte_to_db(mp,
> + XFS_DIR2_FREE_OFFSET)) *
> dp->d_ops->free_max_bests(mp);
> } else {
> free = fbp->b_addr;
> --
> 1.9.0
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-05-23 19:05 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-23 0:03 [PATCH 00/16 V2] xfs: introduce struct xfs_da_geometry Dave Chinner
2014-05-23 0:03 ` [PATCH 01/16] xfs: introduce directory geometry structure Dave Chinner
2014-05-23 19:04 ` Brian Foster
2014-05-26 4:28 ` Dave Chinner
2014-05-26 13:29 ` Brian Foster
2014-05-26 21:39 ` Dave Chinner
2014-05-23 0:03 ` [PATCH 02/16] xfs: move directory block translatiosn to xfs_da_btree.h Dave Chinner
2014-05-23 19:05 ` Brian Foster
2014-05-27 10:46 ` Christoph Hellwig
2014-05-27 23:06 ` Dave Chinner
2014-05-28 5:28 ` Christoph Hellwig
2014-05-28 5:39 ` Dave Chinner
2014-05-23 0:03 ` [PATCH 03/16] xfs: kill XFS_DIR2...FIRSTDB macros Dave Chinner
2014-05-23 19:05 ` Brian Foster [this message]
2014-05-27 10:47 ` Christoph Hellwig
2014-05-23 0:03 ` [PATCH 04/16] xfs: convert dir byte/off conversion to xfs_da_geometry Dave Chinner
2014-05-23 19:05 ` Brian Foster
2014-05-23 0:03 ` [PATCH 05/16] xfs: convert directory dablk " Dave Chinner
2014-05-23 19:06 ` Brian Foster
2014-05-26 4:48 ` Dave Chinner
2014-05-23 0:03 ` [PATCH 06/16] xfs: convert directory db " Dave Chinner
2014-05-23 19:07 ` Brian Foster
2014-05-23 0:03 ` [PATCH 07/16] xfs: convert directory segment limits " Dave Chinner
2014-05-23 20:43 ` Brian Foster
2014-05-23 0:03 ` [PATCH 08/16] xfs: convert m_dirblkfsbs " Dave Chinner
2014-05-23 20:43 ` Brian Foster
2014-05-23 0:03 ` [PATCH 09/16] xfs: convert m_dirblksize " Dave Chinner
2014-05-27 15:59 ` Brian Foster
2014-05-23 0:03 ` [PATCH 10/16] xfs: convert dir/attr btree threshold " Dave Chinner
2014-05-27 15:59 ` Brian Foster
2014-05-23 0:03 ` [PATCH 11/16] xfs: move node entry counts " Dave Chinner
2014-05-27 15:59 ` Brian Foster
2014-05-27 23:47 ` Dave Chinner
2014-05-23 0:03 ` [PATCH 12/16] xfs: reduce direct usage of mp->m_dir_geo Dave Chinner
2014-05-27 15:59 ` Brian Foster
2014-05-27 23:53 ` Dave Chinner
2014-05-23 0:03 ` [PATCH 13/16] xfs: remove mp->m_dir_geo from directory logging Dave Chinner
2014-05-27 16:00 ` Brian Foster
2014-05-23 0:03 ` [PATCH 14/16] xfs: use xfs_da_geometry for block size in attr code Dave Chinner
2014-05-27 16:01 ` Brian Foster
2014-05-23 0:03 ` [PATCH 15/16] xfs: pass xfs_da_args to xfs_attr_leaf_newentsize Dave Chinner
2014-05-27 16:01 ` Brian Foster
2014-05-23 0:03 ` [PATCH 16/16] xfs: repalce attr LBSIZE with xfs_da_geometry Dave Chinner
2014-05-27 16:01 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2014-05-28 6:04 [PATCH 00/16 V3] xfs: introduce struct xfs_da_geometry Dave Chinner
2014-05-28 6:04 ` [PATCH 03/16] xfs: kill XFS_DIR2...FIRSTDB macros Dave Chinner
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=20140523190526.GD8343@laptop.bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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.