xfs: rename xfs_attr_list_int to xfs_attr_list

The version taking the context structure is the main interface to list
attributes, so drop the _int postfix.

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 0e3c213..8d42f57 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -102,8 +102,8 @@ struct xfs_attr_list_context {
  * Overall external interface routines.
  */
 int xfs_attr_inactive(struct xfs_inode *dp);
-int xfs_attr_list_int_ilocked(struct xfs_attr_list_context *);
-int xfs_attr_list_int(struct xfs_attr_list_context *);
+int xfs_attr_list_ilocked(struct xfs_attr_list_context *);
+int xfs_attr_list(struct xfs_attr_list_context *);
 int xfs_inode_hasattr(struct xfs_inode *ip);
 int xfs_attr_get_ilocked(struct xfs_da_args *args);
 int xfs_attr_get(struct xfs_da_args *args);

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index 0553762..9e336d7 100644 (file)
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -98,7 +98,7 @@ struct xchk_xattr {
 /*
  * Check that an extended attribute key can be looked up by hash.
  *
- * We use the XFS attribute list iterator (i.e. xfs_attr_list_int_ilocked)
+ * We use the XFS attribute list iterator (i.e. xfs_attr_list_ilocked)
  * to call this function for every attribute key in an inode.  Once
  * we're here, we load the attribute value to see if any errors happen,
  * or if we get more or less data than we expected.
@@ -516,7 +516,7 @@ xchk_xattr(
         * iteration, which doesn't really follow the usual buffer
         * locking order.
         */
-       error = xfs_attr_list_int_ilocked(&sx.context);
+       error = xfs_attr_list_ilocked(&sx.context);
        if (!xchk_fblock_process_error(sc, XFS_ATTR_FORK, 0, &error))
                goto out;
 

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 09901aa..ba71bf4 100644 (file)
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -507,7 +507,7 @@ xfs_attr_leaf_list(
 }
 
 int
-xfs_attr_list_int_ilocked(
+xfs_attr_list_ilocked(
        struct xfs_attr_list_context    *context)
 {
        struct xfs_inode                *dp = context->dp;
@@ -527,7 +527,7 @@ xfs_attr_list_int_ilocked(
 }
 
 int
-xfs_attr_list_int(
+xfs_attr_list(
        struct xfs_attr_list_context    *context)
 {
        struct xfs_inode                *dp = context->dp;
@@ -540,7 +540,7 @@ xfs_attr_list_int(
                return -EIO;
 
        lock_mode = xfs_ilock_attr_map_shared(dp);
-       error = xfs_attr_list_int_ilocked(context);
+       error = xfs_attr_list_ilocked(context);
        xfs_iunlock(dp, lock_mode);
        return error;
 }

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 07e6dfd..f1f7f1a 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -394,7 +394,7 @@ xfs_ioc_attr_list(
        alist->al_more = 0;
        alist->al_offset[0] = context.bufsize;
 
-       error = xfs_attr_list_int(&context);
+       error = xfs_attr_list(&context);
        ASSERT(error <= 0);
        return error;
 }

diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index b5f2831..2602875 100644 (file)
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -234,7 +234,7 @@ xfs_vn_listxattr(
        context.firstu = context.bufsize;
        context.put_listent = xfs_xattr_put_listent;
 
-       error = xfs_attr_list_int(&context);
+       error = xfs_attr_list(&context);
        if (error)
                return error;
        if (context.count < 0)