Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / btrfs / transaction.c

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 127283913a42907edad5e486b3025e7a942cd57c..cc20e95ea2898ce11af1c100d781d1795a1fb187 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -99,8 +99,8 @@ loop:
                kmem_cache_free(btrfs_transaction_cachep, cur_trans);
                cur_trans = fs_info->running_transaction;
                goto loop;
-       } else if (root->fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
-               spin_unlock(&root->fs_info->trans_lock);
+       } else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
+               spin_unlock(&fs_info->trans_lock);
                kmem_cache_free(btrfs_transaction_cachep, cur_trans);
                return -EROFS;
        }
@@ -357,6 +357,7 @@ again:
        h->root = root;
        h->delayed_ref_updates = 0;
        h->use_count = 1;
+       h->adding_csums = 0;
        h->block_rsv = NULL;
        h->orig_rsv = NULL;
        h->aborted = 0;
@@ -482,7 +483,6 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans,
                                 struct btrfs_root *root)
 {
        struct btrfs_transaction *cur_trans = trans->transaction;
-       struct btrfs_block_rsv *rsv = trans->block_rsv;
        int updates;
        int err;
 
@@ -490,12 +490,6 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans,
        if (cur_trans->blocked || cur_trans->delayed_refs.flushing)
                return 1;
 
-       /*
-        * We need to do this in case we're deleting csums so the global block
-        * rsv get's used instead of the csum block rsv.
-        */
-       trans->block_rsv = NULL;
-
        updates = trans->delayed_ref_updates;
        trans->delayed_ref_updates = 0;
        if (updates) {
@@ -504,8 +498,6 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans,
                        return err;
        }
 
-       trans->block_rsv = rsv;
-
        return should_end_transaction(trans, root);
 }
 
@@ -552,6 +544,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
                }
                count++;
        }
+       btrfs_trans_release_metadata(trans, root);
+       trans->block_rsv = NULL;
 
        if (lock && !atomic_read(&root->fs_info->open_ioctl_trans) &&
            should_end_transaction(trans, root)) {
@@ -1310,9 +1304,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 
        btrfs_run_ordered_operations(root, 0);
 
-       btrfs_trans_release_metadata(trans, root);
-       trans->block_rsv = NULL;
-
        if (cur_trans->aborted)
                goto cleanup_transaction;
 
@@ -1323,6 +1314,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        if (ret)
                goto cleanup_transaction;
 
+       btrfs_trans_release_metadata(trans, root);
+       trans->block_rsv = NULL;
+
        cur_trans = trans->transaction;
 
        /*
@@ -1371,7 +1365,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                spin_unlock(&root->fs_info->trans_lock);
        }
 
-       if (now < cur_trans->start_time || now - cur_trans->start_time < 1)
+       if (!btrfs_test_opt(root, SSD) &&
+           (now < cur_trans->start_time || now - cur_trans->start_time < 1))
                should_grow = 1;
 
        do {
@@ -1581,6 +1576,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        return ret;
 
 cleanup_transaction:
+       btrfs_trans_release_metadata(trans, root);
+       trans->block_rsv = NULL;
        btrfs_printk(root->fs_info, "Skipping commit of aborted transaction.\n");
 //     WARN_ON(1);
        if (current->journal_info == trans)