From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 21/34] xfs: devirtualize ->sf_get_ino and ->sf_put_ino
Date: Mon, 4 Nov 2019 12:33:34 -0800 [thread overview]
Message-ID: <20191104203334.GW4153244@magnolia> (raw)
In-Reply-To: <20191101220719.29100-22-hch@lst.de>
On Fri, Nov 01, 2019 at 03:07:06PM -0700, Christoph Hellwig wrote:
> Replace the ->sf_get_ino and ->sf_put_ino dir ops methods with directly
> called xfs_dir2_sf_get_ino nd xfs_dir2_sf_put_ino helpers that take care
^^^ "and"
> of the difference between the directory format with and without the file
> type field. Also move xfs_dir2_sf_get_parent_ino and
> xfs_dir2_sf_put_parent_ino to xfs_dir2_sf.c with the rest of the
> low-level short form entry handling.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok, except...
<snip>
> diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c
> index f3a4f0ddfc1a..c33d838b1a5c 100644
> --- a/fs/xfs/libxfs/xfs_dir2_sf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_sf.c
> @@ -63,6 +63,69 @@ xfs_dir2_sf_nextentry(
> ((char *)sfep + xfs_dir2_sf_entsize(mp, hdr, sfep->namelen));
> }
>
> +/*
> + * In short-form directory entries the inode numbers are stored at variable
> + * offset behind the entry name. If the entry stores a filetype value, then it
> + * sits between the name and the inode number. The actual inode numbers can
> + * come in two formats as well, either 4 bytes or 8 bytes wide.
> + */
> +xfs_ino_t
> +xfs_dir2_sf_get_ino(
> + struct xfs_mount *mp,
> + struct xfs_dir2_sf_hdr *hdr,
> + struct xfs_dir2_sf_entry *sfep)
> +{
> + uint8_t *from = sfep->name + sfep->namelen;
> +
> + if (xfs_sb_version_hasftype(&mp->m_sb))
> + from++;
> +
> + if (!hdr->i8count)
> + return get_unaligned_be32(from);
> + return get_unaligned_be64(from) & 0x00ffffffffffffffULL;
...maybe we ought to convert this to use XFS_MAXINUMBER instead of
encoding magic numbers?
> +}
> +
> +void
> +xfs_dir2_sf_put_ino(
> + struct xfs_mount *mp,
> + struct xfs_dir2_sf_hdr *hdr,
> + struct xfs_dir2_sf_entry *sfep,
> + xfs_ino_t ino)
> +{
> + uint8_t *to = sfep->name + sfep->namelen;
> +
> + ASSERT((ino & 0xff00000000000000ULL) == 0);
Same here...
> + if (xfs_sb_version_hasftype(&mp->m_sb))
> + to++;
> +
> + if (hdr->i8count)
> + put_unaligned_be64(ino, to);
> + else
> + put_unaligned_be32(ino, to);
> +}
> +
> +xfs_ino_t
> +xfs_dir2_sf_get_parent_ino(
> + struct xfs_dir2_sf_hdr *hdr)
> +{
> + if (!hdr->i8count)
> + return get_unaligned_be32(hdr->parent);
> + return get_unaligned_be64(hdr->parent) & 0x00ffffffffffffffULL;
And here...
> +}
> +
> +void
> +xfs_dir2_sf_put_parent_ino(
> + struct xfs_dir2_sf_hdr *hdr,
> + xfs_ino_t ino)
> +{
> + ASSERT((ino & 0xff00000000000000ULL) == 0);
And here?
--D
> + if (hdr->i8count)
> + put_unaligned_be64(ino, hdr->parent);
> + else
> + put_unaligned_be32(ino, hdr->parent);
> +}
> +
> /*
> * Given a block directory (dp/block), calculate its size as a shortform (sf)
> * directory and a header for the sf directory, if it will fit it the
> @@ -240,7 +303,7 @@ xfs_dir2_block_to_sf(
> (xfs_dir2_data_aoff_t)
> ((char *)dep - (char *)hdr));
> memcpy(sfep->name, dep->name, dep->namelen);
> - dp->d_ops->sf_put_ino(sfp, sfep,
> + xfs_dir2_sf_put_ino(mp, sfp, sfep,
> be64_to_cpu(dep->inumber));
> dp->d_ops->sf_put_ftype(sfep,
> dp->d_ops->data_get_ftype(dep));
> @@ -413,7 +476,7 @@ xfs_dir2_sf_addname_easy(
> sfep->namelen = args->namelen;
> xfs_dir2_sf_put_offset(sfep, offset);
> memcpy(sfep->name, args->name, sfep->namelen);
> - dp->d_ops->sf_put_ino(sfp, sfep, args->inumber);
> + xfs_dir2_sf_put_ino(mp, sfp, sfep, args->inumber);
> dp->d_ops->sf_put_ftype(sfep, args->filetype);
>
> /*
> @@ -503,7 +566,7 @@ xfs_dir2_sf_addname_hard(
> sfep->namelen = args->namelen;
> xfs_dir2_sf_put_offset(sfep, offset);
> memcpy(sfep->name, args->name, sfep->namelen);
> - dp->d_ops->sf_put_ino(sfp, sfep, args->inumber);
> + xfs_dir2_sf_put_ino(mp, sfp, sfep, args->inumber);
> dp->d_ops->sf_put_ftype(sfep, args->filetype);
> sfp->count++;
> if (args->inumber > XFS_DIR2_MAX_SHORT_INUM && !objchange)
> @@ -620,7 +683,7 @@ xfs_dir2_sf_check(
> i < sfp->count;
> i++, sfep = xfs_dir2_sf_nextentry(dp->i_mount, sfp, sfep)) {
> ASSERT(xfs_dir2_sf_get_offset(sfep) >= offset);
> - ino = dp->d_ops->sf_get_ino(sfp, sfep);
> + ino = xfs_dir2_sf_get_ino(dp->i_mount, sfp, sfep);
> i8count += ino > XFS_DIR2_MAX_SHORT_INUM;
> offset =
> xfs_dir2_sf_get_offset(sfep) +
> @@ -712,7 +775,7 @@ xfs_dir2_sf_verify(
> return __this_address;
>
> /* Check the inode number. */
> - ino = dops->sf_get_ino(sfp, sfep);
> + ino = xfs_dir2_sf_get_ino(mp, sfp, sfep);
> i8count += ino > XFS_DIR2_MAX_SHORT_INUM;
> error = xfs_dir_ino_validate(mp, ino);
> if (error)
> @@ -861,7 +924,7 @@ xfs_dir2_sf_lookup(
> sfep->namelen);
> if (cmp != XFS_CMP_DIFFERENT && cmp != args->cmpresult) {
> args->cmpresult = cmp;
> - args->inumber = dp->d_ops->sf_get_ino(sfp, sfep);
> + args->inumber = xfs_dir2_sf_get_ino(mp, sfp, sfep);
> args->filetype = dp->d_ops->sf_get_ftype(sfep);
> if (cmp == XFS_CMP_EXACT)
> return -EEXIST;
> @@ -920,7 +983,7 @@ xfs_dir2_sf_removename(
> i++, sfep = xfs_dir2_sf_nextentry(mp, sfp, sfep)) {
> if (xfs_da_compname(args, sfep->name, sfep->namelen) ==
> XFS_CMP_EXACT) {
> - ASSERT(dp->d_ops->sf_get_ino(sfp, sfep) ==
> + ASSERT(xfs_dir2_sf_get_ino(mp, sfp, sfep) ==
> args->inumber);
> break;
> }
> @@ -1041,9 +1104,10 @@ xfs_dir2_sf_replace(
> i++, sfep = xfs_dir2_sf_nextentry(mp, sfp, sfep)) {
> if (xfs_da_compname(args, sfep->name, sfep->namelen) ==
> XFS_CMP_EXACT) {
> - ino = dp->d_ops->sf_get_ino(sfp, sfep);
> + ino = xfs_dir2_sf_get_ino(mp, sfp, sfep);
> ASSERT(args->inumber != ino);
> - dp->d_ops->sf_put_ino(sfp, sfep, args->inumber);
> + xfs_dir2_sf_put_ino(mp, sfp, sfep,
> + args->inumber);
> dp->d_ops->sf_put_ftype(sfep, args->filetype);
> break;
> }
> @@ -1148,8 +1212,8 @@ xfs_dir2_sf_toino4(
> sfep->namelen = oldsfep->namelen;
> memcpy(sfep->offset, oldsfep->offset, sizeof(sfep->offset));
> memcpy(sfep->name, oldsfep->name, sfep->namelen);
> - dp->d_ops->sf_put_ino(sfp, sfep,
> - dp->d_ops->sf_get_ino(oldsfp, oldsfep));
> + xfs_dir2_sf_put_ino(mp, sfp, sfep,
> + xfs_dir2_sf_get_ino(mp, oldsfp, oldsfep));
> dp->d_ops->sf_put_ftype(sfep, dp->d_ops->sf_get_ftype(oldsfep));
> }
> /*
> @@ -1220,8 +1284,8 @@ xfs_dir2_sf_toino8(
> sfep->namelen = oldsfep->namelen;
> memcpy(sfep->offset, oldsfep->offset, sizeof(sfep->offset));
> memcpy(sfep->name, oldsfep->name, sfep->namelen);
> - dp->d_ops->sf_put_ino(sfp, sfep,
> - dp->d_ops->sf_get_ino(oldsfp, oldsfep));
> + xfs_dir2_sf_put_ino(mp, sfp, sfep,
> + xfs_dir2_sf_get_ino(mp, oldsfp, oldsfep));
> dp->d_ops->sf_put_ftype(sfep, dp->d_ops->sf_get_ftype(oldsfep));
> }
> /*
> diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
> index 7d150e914d00..9d318f091a73 100644
> --- a/fs/xfs/xfs_dir2_readdir.c
> +++ b/fs/xfs/xfs_dir2_readdir.c
> @@ -114,7 +114,7 @@ xfs_dir2_sf_getdents(
> continue;
> }
>
> - ino = dp->d_ops->sf_get_ino(sfp, sfep);
> + ino = xfs_dir2_sf_get_ino(mp, sfp, sfep);
> filetype = dp->d_ops->sf_get_ftype(sfep);
> ctx->pos = off & 0x7fffffff;
> if (!xfs_dir2_namecheck(sfep->name, sfep->namelen)) {
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-11-04 20:34 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 22:06 remove m_dirops Christoph Hellwig
2019-11-01 22:06 ` [PATCH 01/34] xfs: move incore structures out of xfs_da_format.h Christoph Hellwig
2019-11-04 18:21 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 02/34] xfs: refactor btree node scrubbing Christoph Hellwig
2019-11-04 18:36 ` Darrick J. Wong
2019-11-05 1:35 ` Christoph Hellwig
2019-11-01 22:06 ` [PATCH 03/34] xfs: devirtualize ->node_hdr_from_disk Christoph Hellwig
2019-11-04 18:37 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 04/34] xfs: devirtualize ->node_hdr_to_disk Christoph Hellwig
2019-11-04 18:39 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 05/34] xfs: add a btree entries pointer to struct xfs_da3_icnode_hdr Christoph Hellwig
2019-11-04 19:52 ` Darrick J. Wong
2019-11-05 1:38 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 06/34] xfs: move the node header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 19:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 07/34] xfs: devirtualize ->leaf_hdr_from_disk Christoph Hellwig
2019-11-04 19:59 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 08/34] xfs: devirtualize ->leaf_hdr_to_disk Christoph Hellwig
2019-11-04 20:00 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 09/34] xfs: add a entries pointer to struct xfs_dir3_icleaf_hdr Christoph Hellwig
2019-11-04 20:04 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 10/34] xfs: move the dir2 leaf header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:05 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 11/34] xfs: move the max dir2 leaf entries count " Christoph Hellwig
2019-11-04 20:07 ` Darrick J. Wong
2019-11-05 1:42 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 12/34] xfs: devirtualize ->free_hdr_from_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 13/34] xfs: devirtualize ->free_hdr_to_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 14/34] xfs: make the xfs_dir3_icfree_hdr available to xfs_dir2_node_addname_int Christoph Hellwig
2019-11-04 20:25 ` Darrick J. Wong
2019-11-05 1:52 ` Christoph Hellwig
2019-11-05 1:59 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 15/34] xfs: add a bests pointer to struct xfs_dir3_icfree_hdr Christoph Hellwig
2019-11-04 20:21 ` Darrick J. Wong
2019-11-05 1:44 ` Christoph Hellwig
2019-11-05 2:05 ` Darrick J. Wong
2019-11-05 16:44 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 16/34] xfs: move the dir2 free header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:22 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 17/34] xfs: move the max dir2 free bests count " Christoph Hellwig
2019-11-04 20:23 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 19/34] xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 20/34] xfs: devirtualize ->sf_entsize and ->sf_nextentry Christoph Hellwig
2019-11-04 20:28 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 21/34] xfs: devirtualize ->sf_get_ino and ->sf_put_ino Christoph Hellwig
2019-11-04 20:33 ` Darrick J. Wong [this message]
2019-11-07 1:05 ` Darrick J. Wong
2019-11-07 8:29 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 22/34] xfs: devirtualize ->sf_get_ftype and ->sf_put_ftype Christoph Hellwig
2019-11-04 20:34 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 23/34] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods Christoph Hellwig
2019-11-04 20:37 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 24/34] xfs: remove the unused ->data_first_entry_p method Christoph Hellwig
2019-11-04 20:38 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 25/34] xfs: remove the ->data_entry_entry_p method Christoph Hellwig
2019-11-04 20:41 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 26/34] xfs: devirtualize ->data_entsize Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 27/34] xfs: devirtualize ->data_entry_tag_p Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 28/34] xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:46 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 29/34] xfs: cleanup xfs_dir2_data_entsize Christoph Hellwig
2019-11-04 20:48 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 30/34] xfs: devirtualize ->data_bestfree_p Christoph Hellwig
2019-11-04 20:49 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 31/34] xfs: devirtualize ->data_get_ftype and ->data_put_ftype Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 32/34] xfs: remove the now unused dir ops infrastructure Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 33/34] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int Christoph Hellwig
2019-11-04 20:51 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 34/34] xfs: always pass a valid hdr to xfs_dir3_leaf_check_int Christoph Hellwig
2019-11-04 20:53 ` Darrick J. Wong
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=20191104203334.GW4153244@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--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.