From: Chandan Rajendra <chandan@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org,
Allison Collins <allison.henderson@oracle.com>,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: Re: [PATCH 30/30] xfs: embedded the attrlist cursor into struct xfs_attr_list_context
Date: Mon, 10 Feb 2020 20:27:29 +0530 [thread overview]
Message-ID: <41617252.So8b1D6agH@localhost.localdomain> (raw)
In-Reply-To: <20200129170310.51370-31-hch@lst.de>
On Wednesday, January 29, 2020 10:33 PM Christoph Hellwig wrote:
> The attrlist cursor only exists as part of an attr list context, so
> embedd the structure instead of pointing to it. Also give it a proper
> xfs_ prefix and remove the obsolete typedef.
>
The changes look good to me.
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.h | 6 +++---
> fs/xfs/libxfs/xfs_attr_leaf.h | 1 -
> fs/xfs/scrub/attr.c | 2 --
> fs/xfs/xfs_attr_list.c | 19 ++++++-------------
> fs/xfs/xfs_ioctl.c | 16 +++++++---------
> fs/xfs/xfs_ioctl.h | 1 -
> fs/xfs/xfs_trace.h | 12 ++++++------
> fs/xfs/xfs_xattr.c | 2 --
> 8 files changed, 22 insertions(+), 37 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 7a3525dff411..861c81f9bb91 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -31,14 +31,14 @@ struct xfs_attr_list_context;
> /*
> * Kernel-internal version of the attrlist cursor.
> */
> -typedef struct attrlist_cursor_kern {
> +struct xfs_attrlist_cursor_kern {
> __u32 hashval; /* hash value of next entry to add */
> __u32 blkno; /* block containing entry (suggestion) */
> __u32 offset; /* offset in list of equal-hashvals */
> __u16 pad1; /* padding to match user-level */
> __u8 pad2; /* padding to match user-level */
> __u8 initted; /* T/F: cursor has been initialized */
> -} attrlist_cursor_kern_t;
> +};
>
>
> /*========================================================================
> @@ -53,7 +53,7 @@ typedef void (*put_listent_func_t)(struct xfs_attr_list_context *, int,
> struct xfs_attr_list_context {
> struct xfs_trans *tp;
> struct xfs_inode *dp; /* inode */
> - struct attrlist_cursor_kern *cursor; /* position in list */
> + struct xfs_attrlist_cursor_kern cursor; /* position in list */
> void *buffer; /* output buffer */
>
> /*
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h
> index 73615b1dd1a8..6dd2d937a42a 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.h
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.h
> @@ -8,7 +8,6 @@
> #define __XFS_ATTR_LEAF_H__
>
> struct attrlist;
> -struct attrlist_cursor_kern;
> struct xfs_attr_list_context;
> struct xfs_da_args;
> struct xfs_da_state;
> diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
> index d84237af5455..6dd3f5f78251 100644
> --- a/fs/xfs/scrub/attr.c
> +++ b/fs/xfs/scrub/attr.c
> @@ -471,7 +471,6 @@ xchk_xattr(
> struct xfs_scrub *sc)
> {
> struct xchk_xattr sx;
> - struct attrlist_cursor_kern cursor = { 0 };
> xfs_dablk_t last_checked = -1U;
> int error = 0;
>
> @@ -490,7 +489,6 @@ xchk_xattr(
>
> /* Check that every attr key can also be looked up by hash. */
> sx.context.dp = sc->ip;
> - sx.context.cursor = &cursor;
> sx.context.resynch = 1;
> sx.context.put_listent = xchk_xattr_listent;
> sx.context.tp = sc->tp;
> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
> index ea79219859a0..6af71edaa30e 100644
> --- a/fs/xfs/xfs_attr_list.c
> +++ b/fs/xfs/xfs_attr_list.c
> @@ -52,24 +52,19 @@ static int
> xfs_attr_shortform_list(
> struct xfs_attr_list_context *context)
> {
> - struct attrlist_cursor_kern *cursor;
> + struct xfs_attrlist_cursor_kern *cursor = &context->cursor;
> + struct xfs_inode *dp = context->dp;
> struct xfs_attr_sf_sort *sbuf, *sbp;
> struct xfs_attr_shortform *sf;
> struct xfs_attr_sf_entry *sfe;
> - struct xfs_inode *dp;
> int sbsize, nsbuf, count, i;
> int error = 0;
>
> - ASSERT(context != NULL);
> - dp = context->dp;
> - ASSERT(dp != NULL);
> ASSERT(dp->i_afp != NULL);
> sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;
> ASSERT(sf != NULL);
> if (!sf->hdr.count)
> return 0;
> - cursor = context->cursor;
> - ASSERT(cursor != NULL);
>
> trace_xfs_attr_list_sf(context);
>
> @@ -205,7 +200,7 @@ xfs_attr_shortform_list(
> STATIC int
> xfs_attr_node_list_lookup(
> struct xfs_attr_list_context *context,
> - struct attrlist_cursor_kern *cursor,
> + struct xfs_attrlist_cursor_kern *cursor,
> struct xfs_buf **pbp)
> {
> struct xfs_da3_icnode_hdr nodehdr;
> @@ -288,8 +283,8 @@ STATIC int
> xfs_attr_node_list(
> struct xfs_attr_list_context *context)
> {
> + struct xfs_attrlist_cursor_kern *cursor = &context->cursor;
> struct xfs_attr3_icleaf_hdr leafhdr;
> - struct attrlist_cursor_kern *cursor;
> struct xfs_attr_leafblock *leaf;
> struct xfs_da_intnode *node;
> struct xfs_buf *bp;
> @@ -299,7 +294,6 @@ xfs_attr_node_list(
>
> trace_xfs_attr_node_list(context);
>
> - cursor = context->cursor;
> cursor->initted = 1;
>
> /*
> @@ -394,7 +388,7 @@ xfs_attr3_leaf_list_int(
> struct xfs_buf *bp,
> struct xfs_attr_list_context *context)
> {
> - struct attrlist_cursor_kern *cursor;
> + struct xfs_attrlist_cursor_kern *cursor = &context->cursor;
> struct xfs_attr_leafblock *leaf;
> struct xfs_attr3_icleaf_hdr ichdr;
> struct xfs_attr_leaf_entry *entries;
> @@ -408,7 +402,6 @@ xfs_attr3_leaf_list_int(
> xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf);
> entries = xfs_attr3_leaf_entryp(leaf);
>
> - cursor = context->cursor;
> cursor->initted = 1;
>
> /*
> @@ -496,7 +489,7 @@ xfs_attr_leaf_list(
>
> trace_xfs_attr_leaf_list(context);
>
> - context->cursor->blkno = 0;
> + context->cursor.blkno = 0;
> error = xfs_attr3_leaf_read(context->tp, context->dp, 0, &bp);
> if (error)
> return error;
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index d2318857497b..2e8e86d5c01c 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -374,8 +374,7 @@ xfs_ioc_attr_list(
> int flags,
> struct xfs_attrlist_cursor __user *ucursor)
> {
> - struct xfs_attr_list_context context;
> - struct attrlist_cursor_kern cursor;
> + struct xfs_attr_list_context context = { 0 };
> struct xfs_attrlist *alist;
> void *buffer;
> int error;
> @@ -395,12 +394,13 @@ xfs_ioc_attr_list(
> /*
> * Validate the cursor.
> */
> - if (copy_from_user(&cursor, ucursor, sizeof(cursor)))
> + if (copy_from_user(&context.cursor, ucursor, sizeof(context.cursor)))
> return -EFAULT;
> - if (cursor.pad1 || cursor.pad2)
> + if (context.cursor.pad1 || context.cursor.pad2)
> return -EINVAL;
> - if ((cursor.initted == 0) &&
> - (cursor.hashval || cursor.blkno || cursor.offset))
> + if (!context.cursor.initted &&
> + (context.cursor.hashval || context.cursor.blkno ||
> + context.cursor.offset))
> return -EINVAL;
>
> buffer = kmem_zalloc_large(bufsize, 0);
> @@ -410,9 +410,7 @@ xfs_ioc_attr_list(
> /*
> * Initialize the output buffer.
> */
> - memset(&context, 0, sizeof(context));
> context.dp = dp;
> - context.cursor = &cursor;
> context.resynch = 1;
> context.attr_namespace = xfs_attr_namespace(flags);
> context.buffer = buffer;
> @@ -430,7 +428,7 @@ xfs_ioc_attr_list(
> goto out_free;
>
> if (copy_to_user(ubuf, buffer, bufsize) ||
> - copy_to_user(ucursor, &cursor, sizeof(cursor)))
> + copy_to_user(ucursor, &context.cursor, sizeof(context.cursor)))
> error = -EFAULT;
> out_free:
> kmem_free(buffer);
> diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
> index d6e8000ad825..bab6a5a92407 100644
> --- a/fs/xfs/xfs_ioctl.h
> +++ b/fs/xfs/xfs_ioctl.h
> @@ -6,7 +6,6 @@
> #ifndef __XFS_IOCTL_H__
> #define __XFS_IOCTL_H__
>
> -struct attrlist_cursor_kern;
> struct xfs_bstat;
> struct xfs_ibulk;
> struct xfs_inogrp;
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index a064b1523fa5..f886c0a5dbe1 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -59,9 +59,9 @@ DECLARE_EVENT_CLASS(xfs_attr_list_class,
> TP_fast_assign(
> __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev;
> __entry->ino = ctx->dp->i_ino;
> - __entry->hashval = ctx->cursor->hashval;
> - __entry->blkno = ctx->cursor->blkno;
> - __entry->offset = ctx->cursor->offset;
> + __entry->hashval = ctx->cursor.hashval;
> + __entry->blkno = ctx->cursor.blkno;
> + __entry->offset = ctx->cursor.offset;
> __entry->buffer = ctx->buffer;
> __entry->bufsize = ctx->bufsize;
> __entry->count = ctx->count;
> @@ -186,9 +186,9 @@ TRACE_EVENT(xfs_attr_list_node_descend,
> TP_fast_assign(
> __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev;
> __entry->ino = ctx->dp->i_ino;
> - __entry->hashval = ctx->cursor->hashval;
> - __entry->blkno = ctx->cursor->blkno;
> - __entry->offset = ctx->cursor->offset;
> + __entry->hashval = ctx->cursor.hashval;
> + __entry->blkno = ctx->cursor.blkno;
> + __entry->offset = ctx->cursor.offset;
> __entry->buffer = ctx->buffer;
> __entry->bufsize = ctx->bufsize;
> __entry->count = ctx->count;
> diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
> index 1d2c8615b335..b4e740a6b372 100644
> --- a/fs/xfs/xfs_xattr.c
> +++ b/fs/xfs/xfs_xattr.c
> @@ -188,7 +188,6 @@ xfs_vn_listxattr(
> size_t size)
> {
> struct xfs_attr_list_context context;
> - struct attrlist_cursor_kern cursor = { 0 };
> struct inode *inode = d_inode(dentry);
> int error;
>
> @@ -197,7 +196,6 @@ xfs_vn_listxattr(
> */
> memset(&context, 0, sizeof(context));
> context.dp = XFS_I(inode);
> - context.cursor = &cursor;
> context.resynch = 1;
> context.buffer = size ? data : NULL;
> context.bufsize = size;
>
--
chandan
prev parent reply other threads:[~2020-02-10 14:54 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 17:02 clean up the attr interface v3 Christoph Hellwig
2020-01-29 17:02 ` [PATCH 01/30] xfs: reject invalid flags combinations in XFS_IOC_ATTRLIST_BY_HANDLE Christoph Hellwig
2020-02-05 13:46 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 02/30] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-01-29 17:02 ` [PATCH 03/30] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-02-06 8:00 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 04/30] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-02-06 9:21 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 05/30] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-02-06 10:33 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 06/30] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-07 5:20 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 07/30] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-02-07 6:15 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 08/30] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-02-07 6:56 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 09/30] xfs: move struct xfs_da_args to xfs_types.h Christoph Hellwig
2020-01-29 17:02 ` [PATCH 10/30] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-01-29 17:02 ` [PATCH 11/30] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-02-07 9:42 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:02 ` [PATCH 12/30] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-02-07 13:13 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 13/30] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked Christoph Hellwig
2020-02-07 13:19 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 14/30] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-02-08 4:36 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 15/30] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-02-08 5:13 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 16/30] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-02-08 11:35 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 17/30] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-02-08 12:48 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 18/30] xfs: cleanup struct xfs_attr_list_context Christoph Hellwig
2020-02-08 15:53 ` Chandan Rajendra
2020-01-29 17:02 ` [PATCH 19/30] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-01-29 17:02 ` [PATCH 20/30] xfs: open code ATTR_ENTSIZE Christoph Hellwig
2020-02-09 6:57 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 21/30] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-02-09 7:44 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:03 ` [PATCH 22/30] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-02-09 7:52 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 23/30] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-02-09 8:03 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 24/30] xfs: lift buffer allocation " Christoph Hellwig
2020-02-09 8:24 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 25/30] xfs: lift cursor copy in/out " Christoph Hellwig
2020-02-10 6:02 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 26/30] xfs: improve xfs_forget_acl Christoph Hellwig
2020-02-10 6:45 ` Chandan Rajendra
2020-02-17 13:48 ` Christoph Hellwig
2020-01-29 17:03 ` [PATCH 27/30] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-02-10 6:57 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 28/30] xfs: clean up the attr flag confusion Christoph Hellwig
2020-02-10 13:19 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 29/30] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-02-10 13:59 ` Chandan Rajendra
2020-01-29 17:03 ` [PATCH 30/30] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-02-10 14:57 ` Chandan Rajendra [this message]
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=41617252.So8b1D6agH@localhost.localdomain \
--to=chandan@linux.ibm.com \
--cc=allison.henderson@oracle.com \
--cc=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 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).