btrfs: merge calls of btrfs_setxattr and btrfs_setxattr_trans in btrfs_set_prop

Since now the trans argument is never NULL in btrfs_set_prop we don't
have to check. So delete it and use btrfs_setxattr that makes use of
that.

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/props.c b/fs/btrfs/props.c
index c41ed2a..ca27169 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -84,12 +84,8 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                return -EINVAL;
 
        if (value_len == 0) {
-               if (trans)
-                       ret = btrfs_setxattr(trans, inode, handler->xattr_name,
-                                            NULL, 0, flags);
-               else
-                       ret = btrfs_setxattr_trans(inode, handler->xattr_name,
-                                                  NULL, 0, flags);
+               ret = btrfs_setxattr(trans, inode, handler->xattr_name,
+                                    NULL, 0, flags);
                if (ret)
                        return ret;
 
@@ -99,23 +95,14 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
                return ret;
        }
 
-       if (trans)
-               ret = btrfs_setxattr(trans, inode, handler->xattr_name, value,
-                                    value_len, flags);
-       else
-               ret = btrfs_setxattr_trans(inode, handler->xattr_name, value,
-                                          value_len, flags);
-
+       ret = btrfs_setxattr(trans, inode, handler->xattr_name, value,
+                            value_len, flags);
        if (ret)
                return ret;
        ret = handler->apply(inode, value, value_len);
        if (ret) {
-               if (trans)
-                       btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
-                                      0, flags);
-               else
-                       btrfs_setxattr_trans(inode, handler->xattr_name, NULL,
-                                            0, flags);
+               btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
+                              0, flags);
                return ret;
        }