3 files changed, 40 insertions, 23 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 9583a9ae8b79..369b960fce45 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -165,13 +165,23 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int tag)
 {
         int err;
         struct buffer_head *bh = sb_getblk(root->fs_info->sb, blocknr);
+        struct btrfs_header *header;
         BUG_ON(!bh);
+
+        header = btrfs_buffer_header(bh);
+        if (btrfs_header_generation(header) ==
+            root->fs_info->running_transaction->transid) {
+                return 0;
+        }
+
         err = radix_tree_insert(&root->fs_info->pinned_radix,
                                 blocknr, bh);
         if (err && err != -EEXIST) {
                 BUG();
                 return err;
         }
+        if (err == -EEXIST)
+                brelse(bh);
         radix_tree_tag_set(&root->fs_info->pinned_radix, blocknr,
                            tag);
         return 0;
@@ -181,7 +191,7 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int tag)
  * remove an extent from the root, returns 0 on success
  */
 static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
-                         *root, u64 blocknr, u64 num_blocks)
+                         *root, u64 blocknr, u64 num_blocks, int pin)
 {
         struct btrfs_path path;
         struct btrfs_key key;
@@ -213,12 +223,18 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
         btrfs_set_extent_refs(ei, refs);
         if (refs == 0) {
                 u64 super_blocks_used;
+
+                if (pin) {
+                        ret = pin_down_block(root, blocknr,
+                                             CTREE_EXTENT_PINNED);
+                        BUG_ON(ret);
+                }
+
                 super_blocks_used = btrfs_super_blocks_used(info->disk_super);
                 btrfs_set_super_blocks_used(info->disk_super,
                                             super_blocks_used - num_blocks);
                 ret = btrfs_del_item(trans, extent_root, &path);
-                if (extent_root->fs_info->last_insert.objectid >
-                    blocknr)
+                if (extent_root->fs_info->last_insert.objectid > blocknr)
                         extent_root->fs_info->last_insert.objectid = blocknr;
                 if (ret)
                         BUG();
@@ -257,7 +273,7 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
                         radix_tree_tag_clear(radix, gang[i]->b_blocknr,
                                              CTREE_EXTENT_PENDING_DEL);
                         wret = __free_extent(trans, extent_root,
-                                             gang[i]->b_blocknr, 1);
+                                             gang[i]->b_blocknr, 1, 0);
                         if (wret)
                                 err = wret;
                 }
@@ -281,11 +297,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
                 pin_down_block(root, blocknr, CTREE_EXTENT_PENDING_DEL);
                 return 0;
         }
-        if (pin) {
-                ret = pin_down_block(root, blocknr, CTREE_EXTENT_PINNED);
-                BUG_ON(ret);
-        }
-        ret = __free_extent(trans, root, blocknr, num_blocks);
+        ret = __free_extent(trans, root, blocknr, num_blocks, pin);
         pending_ret = del_pending_extents(trans, root->fs_info->extent_root);
         return ret ? ret : pending_ret;
 }
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0ca1080e0198..094a66c267b4 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -146,6 +146,7 @@ static void btrfs_read_locked_inode(struct inode *inode)
         ret = btrfs_lookup_inode(NULL, root, &path, inode->i_ino, 0);
         if (ret) {
                 make_bad_inode(inode);
+                btrfs_release_path(root, &path);
                 return;
         }
         inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 4903b47c9780..46a596e345f0 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -4,12 +4,15 @@
 #include "disk-io.h"
 #include "transaction.h"
 
-
+static int total_trans = 0;
 static void put_transaction(struct btrfs_transaction *transaction)
 {
         transaction->use_count--;
-        if (transaction->use_count == 0)
+        if (transaction->use_count == 0) {
+                WARN_ON(total_trans == 0);
+                total_trans--;
                 kfree(transaction);
+        }
 }
 
 static int join_transaction(struct btrfs_root *root)
@@ -18,6 +21,7 @@ static int join_transaction(struct btrfs_root *root)
         cur_trans = root->fs_info->running_transaction;
         if (!cur_trans) {
                 cur_trans = kmalloc(sizeof(*cur_trans), GFP_NOFS);
+                total_trans++;
                 BUG_ON(!cur_trans);
                 root->fs_info->running_transaction = cur_trans;
                 cur_trans->num_writers = 0;
@@ -108,7 +112,6 @@ static int wait_for_commit(struct btrfs_root *root,
                            struct btrfs_transaction *commit)
 {
         DEFINE_WAIT(wait);
-        commit->use_count++;
         while(!commit->commit_done) {
                 prepare_to_wait(&commit->commit_wait, &wait,
                                 TASK_UNINTERRUPTIBLE);
@@ -126,7 +129,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root)
 {
         int ret = 0;
-        struct buffer_head *snap = root->commit_root;
+        struct buffer_head *snap;
         struct btrfs_key snap_key;
         struct btrfs_transaction *cur_trans;
         DEFINE_WAIT(wait);
@@ -153,15 +156,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         }
         finish_wait(&trans->transaction->writer_wait, &wait);
 
-        cur_trans = root->fs_info->running_transaction;
-        root->fs_info->running_transaction = NULL;
-
         if (root->node != root->commit_root) {
                 memcpy(&snap_key, &root->root_key, sizeof(snap_key));
                 root->root_key.offset++;
         }
 
-        mutex_unlock(&root->fs_info->trans_mutex);
 
         if (btrfs_root_blocknr(&root->root_item) != root->node->b_blocknr) {
                 btrfs_set_root_blocknr(&root->root_item, root->node->b_blocknr);
@@ -173,17 +172,24 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         ret = btrfs_commit_tree_roots(trans, root);
         BUG_ON(ret);
 
+        cur_trans = root->fs_info->running_transaction;
+        root->fs_info->running_transaction = NULL;
+        mutex_unlock(&root->fs_info->trans_mutex);
+
         ret = btrfs_write_and_wait_transaction(trans, root);
         BUG_ON(ret);
 
         write_ctree_super(trans, root);
-        btrfs_finish_extent_commit(trans, root->fs_info->extent_root);
-        btrfs_finish_extent_commit(trans, root->fs_info->tree_root);
+        btrfs_finish_extent_commit(trans, root);
+        mutex_lock(&root->fs_info->trans_mutex);
+        put_transaction(cur_trans);
         put_transaction(cur_trans);
+        mutex_unlock(&root->fs_info->trans_mutex);
         kfree(trans);
 
         if (root->node != root->commit_root) {
                 trans = btrfs_start_transaction(root, 1);
+                snap = root->commit_root;
                 root->commit_root = root->node;
                 get_bh(root->node);
                 ret = btrfs_drop_snapshot(trans, root, snap);
@@ -191,10 +197,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 
                 ret = btrfs_del_root(trans, root->fs_info->tree_root,
                                      &snap_key);
-                BUG_ON(ret);
-                root->fs_info->generation = root->root_key.offset + 1;
-                ret = btrfs_end_transaction(trans, root);
-                BUG_ON(ret);
+                BUG_ON(ret); root->fs_info->generation = root->root_key.offset + 1; ret = btrfs_end_transaction(trans, root); BUG_ON(ret);
+                printk("at free, total trans %d\n", total_trans);
         }
 
         return ret;