xfs: Add attibute remove and helper functions

This patch adds xfs_attr_remove_args. These sub-routines remove
the attributes specified in @args. We will use this later for setting
parent pointers as a deferred attribute operation.

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

2 files changed, 26 insertions, 11 deletions

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 25431ddba1fa..844ed87b1900 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -289,6 +289,30 @@ xfs_attr_set_args(
         return error;
 }
 
+/*
+ * Remove the attribute specified in @args.
+ */
+int
+xfs_attr_remove_args(
+        struct xfs_da_args      *args)
+{
+        struct xfs_inode        *dp = args->dp;
+        int                     error;
+
+        if (!xfs_inode_hasattr(dp)) {
+                error = -ENOATTR;
+        } else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
+                ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);
+                error = xfs_attr_shortform_remove(args);
+        } else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
+                error = xfs_attr_leaf_removename(args);
+        } else {
+                error = xfs_attr_node_removename(args);
+        }
+
+        return error;
+}
+
 int
 xfs_attr_set(
         struct xfs_inode        *dp,
@@ -445,17 +469,7 @@ xfs_attr_remove(
          */
         xfs_trans_ijoin(args.trans, dp, 0);
 
-        if (!xfs_inode_hasattr(dp)) {
-                error = -ENOATTR;
-        } else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
-                ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);
-                error = xfs_attr_shortform_remove(&args);
-        } else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
-                error = xfs_attr_leaf_removename(&args);
-        } else {
-                error = xfs_attr_node_removename(&args);
-        }
-
+        error = xfs_attr_remove_args(&args);
         if (error)
                 goto out;
 
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index f608ac8f306f..bdf52a333f3f 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -142,6 +142,7 @@ int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name,
                  unsigned char *value, int valuelen, int flags);
 int xfs_attr_set_args(struct xfs_da_args *args, struct xfs_buf **leaf_bp);
 int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, int flags);
+int xfs_attr_remove_args(struct xfs_da_args *args);
 int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,
                   int flags, struct attrlist_cursor_kern *cursor);