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@xxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
