Btrfs: don't start the log transaction if the log tree init fails

The old code would start the log transaction even the log tree init
failed, it was unnecessary. Fix it.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 8a03b39648be080302ed1e352c3b01d2b517667e..ca960ad271fe908a294d91b0e3b30f306c89c208 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -139,7 +139,6 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root)
 {
        int ret;
-       int err = 0;
 
        mutex_lock(&root->log_mutex);
        if (root->log_root) {
@@ -155,24 +154,27 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
                mutex_unlock(&root->log_mutex);
                return 0;
        }
-       root->log_multiple_pids = false;
-       root->log_start_pid = current->pid;
+
+       ret = 0;
        mutex_lock(&root->fs_info->tree_log_mutex);
-       if (!root->fs_info->log_root_tree) {
+       if (!root->fs_info->log_root_tree)
                ret = btrfs_init_log_root_tree(trans, root->fs_info);
-               if (ret)
-                       err = ret;
-       }
-       if (err == 0 && !root->log_root) {
+       mutex_unlock(&root->fs_info->tree_log_mutex);
+       if (ret)
+               goto out;
+
+       if (!root->log_root) {
                ret = btrfs_add_log_tree(trans, root);
                if (ret)
-                       err = ret;
+                       goto out;
        }
-       mutex_unlock(&root->fs_info->tree_log_mutex);
+       root->log_multiple_pids = false;
+       root->log_start_pid = current->pid;
        atomic_inc(&root->log_batch);
        atomic_inc(&root->log_writers);
+out:
        mutex_unlock(&root->log_mutex);
-       return err;
+       return ret;
 }
 
 /*
@@ -4116,7 +4118,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
 
        ret = start_log_trans(trans, root);
        if (ret)
-               goto end_trans;
+               goto end_no_trans;
 
        ret = btrfs_log_inode(trans, root, inode, inode_only);
        if (ret)