btrfs: split btrfs_setxattr calls regarding transaction

When the caller has already created the transaction handle,
btrfs_setxattr() will use it. Also adds assert in btrfs_setxattr().

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 d3b04c6abc61c342748b33839ccd461b5d24d5f5..7fe6551bc59b575e5ca3ec84f42ffc188196b45b 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -93,7 +93,11 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
                        goto out;
        }
 
-       ret = btrfs_setxattr_trans(trans, inode, name, value, size, 0);
+       if (trans)
+               ret = btrfs_setxattr(trans, inode, name, value, size, 0);
+       else
+               ret = btrfs_setxattr_trans(NULL, inode, name, value, size, 0);
+
 out:
        kfree(value);
 

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 61ced0ebb5ba69eeacf320ac254af61df050ed83..a73c1bdc7b0532e175bbd7d756b483983021cc05 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -70,8 +70,13 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                return -EINVAL;
 
        if (value_len == 0) {
-               ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name,
-                                          NULL, 0, flags);
+               if (trans)
+                       ret = btrfs_setxattr(trans, inode, handler->xattr_name,
+                                            NULL, 0, flags);
+               else
+                       ret = btrfs_setxattr_trans(NULL, inode,
+                                                  handler->xattr_name, NULL, 0,
+                                                  flags);
                if (ret)
                        return ret;
 
@@ -84,14 +89,23 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
        ret = handler->validate(value, value_len);
        if (ret)
                return ret;
-       ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name,
-                                  value, value_len, flags);
+       if (trans)
+               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);
+
        if (ret)
                return ret;
        ret = handler->apply(inode, value, value_len);
        if (ret) {
-               btrfs_setxattr_trans(trans, inode, handler->xattr_name,
-                                    NULL, 0, flags);
+               if (trans)
+                       btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
+                                      0, flags);
+               else
+                       btrfs_setxattr_trans(NULL, inode, handler->xattr_name,
+                                            NULL, 0, flags);
                return ret;
        }
 
@@ -358,13 +372,13 @@ static int inherit_props(struct btrfs_trans_handle *trans,
                if (ret)
                        return ret;
 
-               ret = btrfs_setxattr_trans(trans, inode, h->xattr_name, value,
-                                          strlen(value), 0);
+               ret = btrfs_setxattr(trans, inode, h->xattr_name, value,
+                                    strlen(value), 0);
                if (!ret) {
                        ret = h->apply(inode, value, strlen(value));
                        if (ret)
-                               btrfs_setxattr_trans(trans, inode, h->xattr_name,
-                                                    NULL, 0, 0);
+                               btrfs_setxattr(trans, inode, h->xattr_name,
+                                              NULL, 0, 0);
                        else
                                set_bit(BTRFS_INODE_HAS_PROPS,
                                        &BTRFS_I(inode)->runtime_flags);

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 4c447b1f32e554ed3afda3f8b0a00b4108733ee1..623d508f21a6844dfa5d725ca798d9202f464336 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -86,6 +86,8 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
        size_t name_len = strlen(name);
        int ret = 0;
 
+       ASSERT(trans);
+
        if (name_len + size > BTRFS_MAX_XATTR_SIZE(root->fs_info))
                return -ENOSPC;
 
@@ -437,8 +439,8 @@ static int btrfs_initxattrs(struct inode *inode,
                }
                strcpy(name, XATTR_SECURITY_PREFIX);
                strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
-               err = btrfs_setxattr_trans(trans, inode, name, xattr->value,
-                                          xattr->value_len, 0);
+               err = btrfs_setxattr(trans, inode, name, xattr->value,
+                                    xattr->value_len, 0);
                kfree(name);
                if (err < 0)
                        break;