xfs: embedded the attrlist cursor into struct xfs_attr_list_context

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.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index a6bedb0eda2630e625f210225109ff4312d8d003..0d2d05908537c706bd8e337d0b51ffe80ca190b9 100644 (file)
--- 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 73615b1dd1a80dacd3f385a707a058718e659ebb..6dd2d937a42a36ce0ee40af8818fd13c50fac268 100644 (file)
--- 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 4ba4eae0dbc39fe70dfe0a96bfe42207ac5186cb..0d3b5c03eca0c3de7bd811dc680c3febf678b864 100644 (file)
--- 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 ba71bf4303f86e8654edf158a4a0024237e779c8..017f5691abfad7ca5bc546e9f89300a26b7a3f06 100644 (file)
--- 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 @@ out:
 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 9ddaa3cf9bf4cc3e5631cf3ffa38b69ebc2a1e6f..2af73d664613dfea99da5b7f9cec2b715772acda 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -375,8 +375,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 = { };
        struct xfs_attrlist             *alist;
        void                            *buffer;
        int                             error;
@@ -396,12 +395,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);
@@ -411,9 +411,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_filter = xfs_attr_filter(flags);
        context.buffer = buffer;
@@ -431,7 +429,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 d6e8000ad82580149caf62cd4e86ac167a3c6b44..bab6a5a924077fff1a4631bb905602a7be4a8c33 100644 (file)
--- 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 4a69bffed706156860b9669a0a7fbc807846f1b1..059c3098a4a0d5603c4698e5c4abf37344625cbc 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -60,9 +60,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 361c72549ec99168adb64d3900aa484c9ecfeca0..fc5d7276026e461b575000de6645f48ba7972806 100644 (file)
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -190,7 +190,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;
 
@@ -199,7 +198,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;