From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v7 21/23] xfs: Add helper function xfs_attr_list_context_init
Date: Sat, 9 Jun 2018 22:05:06 -0700 [thread overview]
Message-ID: <1528607108-11059-22-git-send-email-allison.henderson@oracle.com> (raw)
In-Reply-To: <1528607108-11059-1-git-send-email-allison.henderson@oracle.com>
This patch adds a helper function xfs_attr_list_context_init
used by xfs_attr_list. This function initializes the
xfs_attr_list_context structure passed to xfs_attr_list_int.
We will need this later to call xfs_attr_list_int_ilocked when
the node is already locked.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
fs/xfs/libxfs/xfs_attr.h | 3 ++
fs/xfs/xfs_attr_list.c | 72 +++++++++++++++++++++++++++++++-----------------
2 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index d041734..79c516b 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -184,6 +184,9 @@ int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name,
int xfs_attr_remove_args(struct xfs_da_args *args, int flags, bool roll_trans);
int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,
int flags, struct attrlist_cursor_kern *cursor);
+int xfs_attr_list_context_init(struct xfs_inode *dp, char *buffer, int bufsize,
+ int flags, struct attrlist_cursor_kern *cursor,
+ struct xfs_attr_list_context *context);
int xfs_attr_args_init(struct xfs_da_args *args, struct xfs_inode *dp,
const unsigned char *name, size_t namelen, int flags);
int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 3e59a34..df8faf5 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -603,23 +603,19 @@ xfs_attr_put_listent(
}
/*
- * Generate a list of extended attribute names and optionally
- * also value lengths. Positive return value follows the XFS
- * convention of being an error, zero or negative return code
- * is the length of the buffer returned (negated), indicating
- * success.
+ * Initializes an xfs_attr_list_context suitable for
+ * use by xfs_attr_list
*/
int
-xfs_attr_list(
- xfs_inode_t *dp,
- char *buffer,
- int bufsize,
- int flags,
- attrlist_cursor_kern_t *cursor)
+xfs_attr_list_context_init(
+ xfs_inode_t *dp,
+ char *buffer,
+ int bufsize,
+ int flags,
+ struct attrlist_cursor_kern *cursor,
+ struct xfs_attr_list_context *context)
{
- xfs_attr_list_context_t context;
struct attrlist *alist;
- int error;
/*
* Validate the cursor.
@@ -645,20 +641,46 @@ xfs_attr_list(
/*
* Initialize the output buffer.
*/
- memset(&context, 0, sizeof(context));
- context.dp = dp;
- context.cursor = cursor;
- context.resynch = 1;
- context.flags = flags;
- context.alist = buffer;
- context.bufsize = (bufsize & ~(sizeof(int)-1)); /* align */
- context.firstu = context.bufsize;
- context.put_listent = xfs_attr_put_listent;
-
- alist = (struct attrlist *)context.alist;
+ memset(context, 0, sizeof(xfs_attr_list_context_t));
+ context->dp = dp;
+ context->cursor = cursor;
+ context->resynch = 1;
+ context->flags = flags;
+ context->alist = buffer;
+ context->bufsize = (bufsize & ~(sizeof(int)-1)); /* align */
+ context->firstu = context->bufsize;
+ context->put_listent = xfs_attr_put_listent;
+
+ alist = (struct attrlist *)context->alist;
alist->al_count = 0;
alist->al_more = 0;
- alist->al_offset[0] = context.bufsize;
+ alist->al_offset[0] = context->bufsize;
+
+ return 0;
+}
+
+/*
+ * Generate a list of extended attribute names and optionally
+ * also value lengths. Positive return value follows the XFS
+ * convention of being an error, zero or negative return code
+ * is the length of the buffer returned (negated), indicating
+ * success.
+ */
+int
+xfs_attr_list(
+ xfs_inode_t *dp,
+ char *buffer,
+ int bufsize,
+ int flags,
+ attrlist_cursor_kern_t *cursor)
+{
+ xfs_attr_list_context_t context;
+ int error;
+
+ error = xfs_attr_list_context_init(dp, buffer, bufsize, flags,
+ cursor, &context);
+ if (error)
+ return error;
error = xfs_attr_list_int(&context);
ASSERT(error <= 0);
--
2.7.4
next prev parent reply other threads:[~2018-06-10 5:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 5:04 [PATCH v7 00/23] Parent Pointers v7 Allison Henderson
2018-06-10 5:04 ` [PATCH v7 01/23] xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h Allison Henderson
2018-06-10 5:04 ` [PATCH v7 02/23] xfs: Add helper function xfs_attr_try_sf_addname Allison Henderson
2018-06-10 6:58 ` Amir Goldstein
2018-06-10 15:30 ` Allison Henderson
2018-06-10 5:04 ` [PATCH v7 03/23] xfs: Add trans toggle to attr routines Allison Henderson
2018-06-13 12:11 ` Brian Foster
2018-06-14 1:27 ` Allison Henderson
2018-06-10 5:04 ` [PATCH v7 04/23] xfs: Add attibute set and helper functions Allison Henderson
2018-06-10 5:04 ` [PATCH v7 05/23] xfs: Add attibute remove " Allison Henderson
2018-06-10 5:04 ` [PATCH v7 06/23] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2018-06-13 15:18 ` Brian Foster
2018-06-14 1:28 ` Allison Henderson
2018-06-14 11:13 ` Brian Foster
2018-06-10 5:04 ` [PATCH v7 07/23] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2018-06-10 5:04 ` [PATCH v7 08/23] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2018-06-10 5:04 ` [PATCH v7 09/23] xfs: get directory offset when adding directory name Allison Henderson
2018-06-10 5:04 ` [PATCH v7 10/23] xfs: get directory offset when removing " Allison Henderson
2018-06-10 5:04 ` [PATCH v7 11/23] xfs: get directory offset when replacing a " Allison Henderson
2018-06-10 5:04 ` [PATCH v7 12/23] xfs: add parent pointer support to attribute code Allison Henderson
2018-06-10 5:04 ` [PATCH v7 13/23] xfs: define parent pointer xattr format Allison Henderson
2018-06-10 5:04 ` [PATCH v7 14/23] xfs: extent transaction reservations for parent attributes Allison Henderson
2018-06-10 5:05 ` [PATCH v7 15/23] xfs: Hold inode locks in xfs_ialloc Allison Henderson
2018-06-10 5:05 ` [PATCH v7 16/23] xfs: parent pointer attribute creation Allison Henderson
2018-06-10 5:05 ` [PATCH v7 17/23] xfs: add parent attributes to link Allison Henderson
2018-06-10 5:05 ` [PATCH v7 18/23] xfs: remove parent pointers in unlink Allison Henderson
2018-06-10 5:05 ` [PATCH v7 19/23] xfs: Add parent pointers to rename Allison Henderson
2018-06-10 13:39 ` Amir Goldstein
2018-06-10 17:34 ` Allison Henderson
2018-06-10 5:05 ` [PATCH v7 20/23] xfs: Add the parent pointer support to the superblock version 5 Allison Henderson
2018-06-10 5:05 ` Allison Henderson [this message]
2018-06-10 5:05 ` [PATCH v7 22/23] xfs: Add parent pointer ioctl Allison Henderson
2018-06-10 5:05 ` [PATCH v7 23/23] xfs: Add delayed attributes error tag Allison Henderson
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=1528607108-11059-22-git-send-email-allison.henderson@oracle.com \
--to=allison.henderson@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 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).