From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org,
Allison Collins <allison.henderson@oracle.com>
Subject: Re: [PATCH 16/29] xfs: factor out a xfs_attr_match helper
Date: Tue, 21 Jan 2020 10:27:43 -0800 [thread overview]
Message-ID: <20200121182743.GP8247@magnolia> (raw)
In-Reply-To: <20200114081051.297488-17-hch@lst.de>
On Tue, Jan 14, 2020 at 09:10:38AM +0100, Christoph Hellwig wrote:
> Factor out a helper that compares an on-disk attr vs the name, length and
> flags specified in struct xfs_da_args.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_attr_leaf.c | 80 +++++++++++++----------------------
> 1 file changed, 30 insertions(+), 50 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
> index b0658eb8fbcc..8852754153ba 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -445,14 +445,21 @@ xfs_attr3_leaf_read(
> * Namespace helper routines
> *========================================================================*/
>
> -/*
> - * If namespace bits don't match return 0.
> - * If all match then return 1.
> - */
> -STATIC int
> -xfs_attr_namesp_match(int arg_flags, int ondisk_flags)
> +static bool
/me wonders if this ought to be static inline but otherwise,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> +xfs_attr_match(
> + struct xfs_da_args *args,
> + uint8_t namelen,
> + unsigned char *name,
> + int flags)
> {
> - return XFS_ATTR_NSP_ONDISK(ondisk_flags) == XFS_ATTR_NSP_ARGS_TO_ONDISK(arg_flags);
> + if (args->namelen != namelen)
> + return false;
> + if (memcmp(args->name, name, namelen) != 0)
> + return false;
> + if (XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags) !=
> + XFS_ATTR_NSP_ONDISK(flags))
> + return false;
> + return true;
> }
>
> static int
> @@ -678,15 +685,8 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff)
> sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;
> sfe = &sf->list[0];
> for (i = 0; i < sf->hdr.count; sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) {
> -#ifdef DEBUG
> - if (sfe->namelen != args->namelen)
> - continue;
> - if (memcmp(args->name, sfe->nameval, args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, sfe->flags))
> - continue;
> - ASSERT(0);
> -#endif
> + ASSERT(!xfs_attr_match(args, sfe->namelen, sfe->nameval,
> + sfe->flags));
> }
>
> offset = (char *)sfe - (char *)sf;
> @@ -749,13 +749,9 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
> for (i = 0; i < end; sfe = XFS_ATTR_SF_NEXTENTRY(sfe),
> base += size, i++) {
> size = XFS_ATTR_SF_ENTSIZE(sfe);
> - if (sfe->namelen != args->namelen)
> - continue;
> - if (memcmp(sfe->nameval, args->name, args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, sfe->flags))
> - continue;
> - break;
> + if (xfs_attr_match(args, sfe->namelen, sfe->nameval,
> + sfe->flags))
> + break;
> }
> if (i == end)
> return -ENOATTR;
> @@ -816,13 +812,9 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args)
> sfe = &sf->list[0];
> for (i = 0; i < sf->hdr.count;
> sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) {
> - if (sfe->namelen != args->namelen)
> - continue;
> - if (memcmp(args->name, sfe->nameval, args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, sfe->flags))
> - continue;
> - return -EEXIST;
> + if (xfs_attr_match(args, sfe->namelen, sfe->nameval,
> + sfe->flags))
> + return -EEXIST;
> }
> return -ENOATTR;
> }
> @@ -847,14 +839,10 @@ xfs_attr_shortform_getvalue(
> sfe = &sf->list[0];
> for (i = 0; i < sf->hdr.count;
> sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) {
> - if (sfe->namelen != args->namelen)
> - continue;
> - if (memcmp(args->name, sfe->nameval, args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, sfe->flags))
> - continue;
> - return xfs_attr_copy_value(args, &sfe->nameval[args->namelen],
> - sfe->valuelen);
> + if (xfs_attr_match(args, sfe->namelen, sfe->nameval,
> + sfe->flags))
> + return xfs_attr_copy_value(args,
> + &sfe->nameval[args->namelen], sfe->valuelen);
> }
> return -ENOATTR;
> }
> @@ -2409,23 +2397,15 @@ xfs_attr3_leaf_lookup_int(
> }
> if (entry->flags & XFS_ATTR_LOCAL) {
> name_loc = xfs_attr3_leaf_name_local(leaf, probe);
> - if (name_loc->namelen != args->namelen)
> - continue;
> - if (memcmp(args->name, name_loc->nameval,
> - args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, entry->flags))
> + if (!xfs_attr_match(args, name_loc->namelen,
> + name_loc->nameval, entry->flags))
> continue;
> args->index = probe;
> return -EEXIST;
> } else {
> name_rmt = xfs_attr3_leaf_name_remote(leaf, probe);
> - if (name_rmt->namelen != args->namelen)
> - continue;
> - if (memcmp(args->name, name_rmt->name,
> - args->namelen) != 0)
> - continue;
> - if (!xfs_attr_namesp_match(args->flags, entry->flags))
> + if (!xfs_attr_match(args, name_rmt->namelen,
> + name_rmt->name, entry->flags))
> continue;
> args->index = probe;
> args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-01-21 18:27 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 8:10 clean up the attr interface v2 Christoph Hellwig
2020-01-14 8:10 ` [PATCH 01/29] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-01-17 0:59 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 02/29] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-01-21 17:28 ` Darrick J. Wong
2020-01-25 4:17 ` Allison Collins
2020-01-25 23:22 ` Christoph Hellwig
2020-01-26 22:23 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 03/29] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-01-21 17:41 ` Darrick J. Wong
2020-01-23 22:33 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 04/29] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-01-21 17:45 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 05/29] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-01-21 17:54 ` Darrick J. Wong
2020-01-23 22:34 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 06/29] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-01-21 17:57 ` Darrick J. Wong
2020-01-23 22:35 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 07/29] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-01-21 18:03 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 08/29] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2020-01-21 18:48 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 09/29] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-01-21 18:07 ` Darrick J. Wong
2020-01-23 22:36 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 10/29] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-01-21 18:10 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 11/29] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-01-21 18:12 ` Darrick J. Wong
2020-01-23 22:39 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 12/29] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-01-21 18:13 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 13/29] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-01-21 18:15 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 14/29] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-01-21 18:17 ` Darrick J. Wong
2020-01-23 22:40 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 15/29] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-01-21 18:20 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 16/29] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-01-21 18:27 ` Darrick J. Wong [this message]
2020-01-23 22:41 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 17/29] xfs: cleanup xfs_attr_list_context Christoph Hellwig
2020-01-21 18:30 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 18/29] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-01-21 18:33 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 19/29] xfs: replace ATTR_ENTBASESIZE with offsetoff Christoph Hellwig
2020-01-21 18:36 ` Darrick J. Wong
2020-01-23 22:43 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 20/29] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-01-21 18:41 ` Darrick J. Wong
2020-01-24 23:13 ` Christoph Hellwig
2020-01-14 8:10 ` [PATCH 21/29] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-01-21 18:42 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 22/29] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-01-21 18:43 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 23/29] xfs: lift buffer allocation " Christoph Hellwig
2020-01-21 18:49 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 24/29] xfs: lift cursor copy in/out " Christoph Hellwig
2020-01-21 18:52 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 25/29] xfs: improve xfs_forget_acl Christoph Hellwig
2020-01-21 18:56 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 26/29] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-01-21 18:57 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 27/29] xfs: clean up the attr flag confusion Christoph Hellwig
2020-01-21 19:44 ` Darrick J. Wong
2020-01-24 23:24 ` Christoph Hellwig
2020-01-25 23:10 ` Christoph Hellwig
2020-01-26 22:24 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 28/29] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-01-21 19:45 ` Darrick J. Wong
2020-01-14 8:10 ` [PATCH 29/29] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-01-21 19:04 ` 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=20200121182743.GP8247@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@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 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).