Btrfs: Fix compile warning around num_online_cpus() in a min statement

[safe/jmp/linux-2.6] / fs / btrfs / transaction.c

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index eec8b24..4604178 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -28,7 +28,6 @@
 #include "ref-cache.h"
 #include "tree-log.h"
 
-static int total_trans = 0;
 extern struct kmem_cache *btrfs_trans_handle_cachep;
 extern struct kmem_cache *btrfs_transaction_cachep;
 
@@ -39,8 +38,6 @@ static noinline void put_transaction(struct btrfs_transaction *transaction)
        WARN_ON(transaction->use_count == 0);
        transaction->use_count--;
        if (transaction->use_count == 0) {
-               WARN_ON(total_trans == 0);
-               total_trans--;
                list_del_init(&transaction->list);
                memset(transaction, 0, sizeof(*transaction));
                kmem_cache_free(btrfs_transaction_cachep, transaction);
@@ -57,7 +54,6 @@ static noinline int join_transaction(struct btrfs_root *root)
        if (!cur_trans) {
                cur_trans = kmem_cache_alloc(btrfs_transaction_cachep,
                                             GFP_NOFS);
-               total_trans++;
                BUG_ON(!cur_trans);
                root->fs_info->generation++;
                root->fs_info->last_alloc = 0;
@@ -186,7 +182,7 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
        h->transaction = root->fs_info->running_transaction;
        h->blocks_reserved = num_blocks;
        h->blocks_used = 0;
-       h->block_group = NULL;
+       h->block_group = 0;
        h->alloc_exclude_nr = 0;
        h->alloc_exclude_start = 0;
        root->fs_info->running_transaction->use_count++;
@@ -332,7 +328,6 @@ int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,
        int werr = 0;
        struct page *page;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;
        u64 start = 0;
        u64 end;
        unsigned long index;
@@ -373,11 +368,6 @@ int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,
                        page_cache_release(page);
                }
        }
-       /*
-        * we unplug once and then use the wait_on_extent_bit for
-        * everything else
-        */
-       blk_run_address_space(btree_inode->i_mapping);
        while(1) {
                ret = find_first_extent_bit(dirty_pages, 0, &start, &end,
                                            EXTENT_DIRTY);
@@ -398,28 +388,7 @@ int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,
                                if (err)
                                        werr = err;
                        }
-                       if (PageWriteback(page)) {
-                               /*
-                                * we don't wait on the page writeback bit
-                                * because that triggers a lot of unplugs.
-                                * The extent bits are much nicer to
-                                * the disks, but come with a slightly
-                                * higher latency because we aren't forcing
-                                * unplugs.
-                                */
-                               wait_on_extent_writeback(io_tree,
-                                        page_offset(page),
-                                        page_offset(page) +
-                                        PAGE_CACHE_SIZE - 1);
-                       }
-                       if (PageWriteback(page)) {
-                               /*
-                                * the state bits get cleared before the
-                                * page bits, lets add some extra
-                                * paranoia here
-                                */
-                               wait_on_page_writeback(page);
-                       }
+                       wait_on_page_writeback(page);
                        page_cache_release(page);
                        cond_resched();
                }
@@ -831,28 +800,43 @@ static noinline int finish_pending_snapshot(struct btrfs_fs_info *fs_info,
        struct btrfs_trans_handle *trans;
        struct inode *parent_inode;
        struct inode *inode;
+       struct btrfs_root *parent_root;
 
-       trans = btrfs_start_transaction(fs_info->fs_root, 1);
+       parent_inode = pending->dentry->d_parent->d_inode;
+       parent_root = BTRFS_I(parent_inode)->root;
+       trans = btrfs_start_transaction(parent_root, 1);
 
        /*
         * insert the directory item
         */
        namelen = strlen(pending->name);
-       parent_inode = pending->dentry->d_parent->d_inode;
        ret = btrfs_set_inode_index(parent_inode, &index);
-       ret = btrfs_insert_dir_item(trans,
-                           BTRFS_I(parent_inode)->root,
+       ret = btrfs_insert_dir_item(trans, parent_root,
                            pending->name, namelen,
                            parent_inode->i_ino,
                            &pending->root_key, BTRFS_FT_DIR, index);
 
        if (ret)
                goto fail;
-#if 0
-       ret = btrfs_insert_inode_ref(trans, root->fs_info->tree_root,
-                            pending->name, strlen(pending->name), objectid,
-                            root->fs_info->sb->s_root->d_inode->i_ino, 0);
-#endif
+
+       /* add the backref first */
+       ret = btrfs_add_root_ref(trans, parent_root->fs_info->tree_root,
+                                pending->root_key.objectid,
+                                BTRFS_ROOT_BACKREF_KEY,
+                                parent_root->root_key.objectid,
+                                parent_inode->i_ino, index, pending->name,
+                                namelen);
+
+       BUG_ON(ret);
+
+       /* now add the forward ref */
+       ret = btrfs_add_root_ref(trans, parent_root->fs_info->tree_root,
+                                parent_root->root_key.objectid,
+                                BTRFS_ROOT_REF_KEY,
+                                pending->root_key.objectid,
+                                parent_inode->i_ino, index, pending->name,
+                                namelen);
+
        inode = btrfs_lookup_dentry(parent_inode, pending->dentry);
        d_instantiate(pending->dentry, inode);
 fail:
@@ -1054,7 +1038,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
        mutex_unlock(&root->fs_info->trans_mutex);
        ret = btrfs_write_and_wait_transaction(trans, root);
        BUG_ON(ret);
-       write_ctree_super(trans, root);
+       write_ctree_super(trans, root, 0);
 
        /*
         * the super is written, we can safely allow the tree-loggers