[PATCH 10/10] btrfs: btrfs_set_prop trans is never null

[Anand Jain]

Since now the trans argument is never null we don't have to check if
its null. So delete it.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
 fs/btrfs/props.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index c41ed2a6347e..ca2716917e37 100644
--- 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;
        }
 
-- 
2.20.1 (Apple Git-117)