btrfs: cleanup btrfs_setxattr_trans and drop transaction parameter

Previous patch made sure that btrfs_setxattr_trans() is called only when
transaction NULL.  Clean up btrfs_setxattr_trans() and drop the
parameter.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 7fe6551..a0af1b9 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -96,7 +96,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
        if (trans)
                ret = btrfs_setxattr(trans, inode, name, value, size, 0);
        else
-               ret = btrfs_setxattr_trans(NULL, inode, name, value, size, 0);
+               ret = btrfs_setxattr_trans(inode, name, value, size, 0);
 
 out:
        kfree(value);

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index a73c1bd..44b7bf6 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -74,9 +74,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                        ret = btrfs_setxattr(trans, inode, handler->xattr_name,
                                             NULL, 0, flags);
                else
-                       ret = btrfs_setxattr_trans(NULL, inode,
-                                                  handler->xattr_name, NULL, 0,
-                                                  flags);
+                       ret = btrfs_setxattr_trans(inode, handler->xattr_name,
+                                                  NULL, 0, flags);
                if (ret)
                        return ret;
 
@@ -93,8 +92,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                ret = btrfs_setxattr(trans, inode, handler->xattr_name, value,
                                     value_len, flags);
        else
-               ret = btrfs_setxattr_trans(NULL, inode, handler->xattr_name,
-                                          value, value_len, flags);
+               ret = btrfs_setxattr_trans(inode, handler->xattr_name, value,
+                                          value_len, flags);
 
        if (ret)
                return ret;
@@ -104,8 +103,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                        btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
                                       0, flags);
                else
-                       btrfs_setxattr_trans(NULL, inode, handler->xattr_name,
-                                            NULL, 0, flags);
+                       btrfs_setxattr_trans(inode, handler->xattr_name, NULL,
+                                            0, flags);
                return ret;
        }
 

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 623d508..10da873 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -221,16 +221,13 @@ out:
 /*
  * @value: "" makes the attribute to empty, NULL removes it
  */
-int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
-                        struct inode *inode, const char *name,
+int btrfs_setxattr_trans(struct inode *inode, const char *name,
                         const void *value, size_t size, int flags)
 {
        struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_trans_handle *trans;
        int ret;
 
-       if (trans)
-               return btrfs_setxattr(trans, inode, name, value, size, flags);
-
        trans = btrfs_start_transaction(root, 2);
        if (IS_ERR(trans))
                return PTR_ERR(trans);
@@ -368,7 +365,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
                                   size_t size, int flags)
 {
        name = xattr_full_name(handler, name);
-       return btrfs_setxattr_trans(NULL, inode, name, buffer, size, flags);
+       return btrfs_setxattr_trans(inode, name, buffer, size, flags);
 }
 
 static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,

diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index a95834c..1cd3fc0 100644 (file)
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -14,9 +14,8 @@ int btrfs_getxattr(struct inode *inode, const char *name,
                void *buffer, size_t size);
 int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
                   const char *name, const void *value, size_t size, int flags);
-int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
-                           struct inode *inode, const char *name,
-                           const void *value, size_t size, int flags);
+int btrfs_setxattr_trans(struct inode *inode, const char *name,
+                        const void *value, size_t size, int flags);
 ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 
 int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,