#include <linux/fs.h>
#include <linux/sched.h>
+#include <linux/writeback.h>
+#include <linux/pagemap.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
cur_trans->commit_done = 0;
cur_trans->start_time = get_seconds();
list_add_tail(&cur_trans->list, &root->fs_info->trans_list);
- init_bit_radix(&cur_trans->dirty_pages);
+ extent_map_tree_init(&cur_trans->dirty_pages,
+ root->fs_info->btree_inode->i_mapping,
+ GFP_NOFS);
} else {
cur_trans->num_writers++;
cur_trans->num_joined++;
(unsigned long)root->root_key.objectid,
BTRFS_ROOT_DEFRAG_TAG);
root->commit_root = root->node;
- get_bh(root->node);
+ extent_buffer_get(root->node);
} else {
WARN_ON(1);
}
int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans,
struct btrfs_root *root)
{
- unsigned long gang[16];
int ret;
- int i;
int err;
int werr = 0;
+ struct extent_map_tree *dirty_pages;
struct page *page;
- struct radix_tree_root *dirty_pages;
struct inode *btree_inode = root->fs_info->btree_inode;
+ u64 start;
+ u64 end;
+ unsigned long index;
if (!trans || !trans->transaction) {
return filemap_write_and_wait(btree_inode->i_mapping);
}
dirty_pages = &trans->transaction->dirty_pages;
while(1) {
- ret = find_first_radix_bit(dirty_pages, gang,
- 0, ARRAY_SIZE(gang));
- if (!ret)
+ ret = find_first_extent_bit(dirty_pages, 0, &start, &end,
+ EXTENT_DIRTY);
+ if (ret)
break;
- for (i = 0; i < ret; i++) {
- /* FIXME EIO */
- clear_radix_bit(dirty_pages, gang[i]);
- page = find_lock_page(btree_inode->i_mapping,
- gang[i]);
+ clear_extent_dirty(dirty_pages, start, end, GFP_NOFS);
+ while(start <= end) {
+ index = start >> PAGE_CACHE_SHIFT;
+ start = (index + 1) << PAGE_CACHE_SHIFT;
+ page = find_lock_page(btree_inode->i_mapping, index);
if (!page)
continue;
if (PageWriteback(page)) {
btrfs_write_dirty_block_groups(trans, extent_root);
while(1) {
old_extent_block = btrfs_root_blocknr(&extent_root->root_item);
- if (old_extent_block == bh_blocknr(extent_root->node))
+ if (old_extent_block ==
+ extent_buffer_blocknr(extent_root->node))
break;
btrfs_set_root_blocknr(&extent_root->root_item,
- bh_blocknr(extent_root->node));
+ extent_buffer_blocknr(extent_root->node));
ret = btrfs_update_root(trans, tree_root,
&extent_root->root_key,
&extent_root->root_item);
struct btrfs_root *latest_root;
};
-int btrfs_add_dead_root(struct btrfs_root *root, struct list_head *dead_list)
+int btrfs_add_dead_root(struct btrfs_root *root,
+ struct btrfs_root *latest,
+ struct list_head *dead_list)
{
struct dirty_root *dirty;
if (!dirty)
return -ENOMEM;
dirty->root = root;
+ dirty->latest_root = latest;
list_add(&dirty->list, dead_list);
return 0;
}
(unsigned long)root->root_key.objectid,
BTRFS_ROOT_TRANS_TAG);
if (root->commit_root == root->node) {
- WARN_ON(bh_blocknr(root->node) !=
+ WARN_ON(extent_buffer_blocknr(root->node) !=
btrfs_root_blocknr(&root->root_item));
- brelse(root->commit_root);
+ free_extent_buffer(root->commit_root);
root->commit_root = NULL;
/* make sure to update the root on disk
root->root_key.offset = root->fs_info->generation;
btrfs_set_root_blocknr(&root->root_item,
- bh_blocknr(root->node));
+ extent_buffer_blocknr(root->node));
err = btrfs_insert_root(trans, root->fs_info->tree_root,
&root->root_key,
&root->root_item);
struct btrfs_fs_info *info = root->fs_info;
int ret;
struct btrfs_trans_handle *trans;
+ unsigned long nr;
if (root->defrag_running)
return 0;
trans = btrfs_start_transaction(root, 1);
- while (1) {
+ while (0) {
root->defrag_running = 1;
ret = btrfs_defrag_leaves(trans, root, cacheonly);
+ nr = trans->blocks_used;
btrfs_end_transaction(trans, root);
mutex_unlock(&info->fs_mutex);
- btrfs_btree_balance_dirty(root);
+ btrfs_btree_balance_dirty(info->tree_root, nr);
cond_resched();
mutex_lock(&info->fs_mutex);
btrfs_defrag_root(root, 1);
}
}
- btrfs_defrag_root(info->extent_root, 1);
+ // btrfs_defrag_root(info->extent_root, 1);
return err;
}
{
struct dirty_root *dirty;
struct btrfs_trans_handle *trans;
+ unsigned long nr;
u64 num_blocks;
u64 blocks_used;
int ret = 0;
dirty = list_entry(list->next, struct dirty_root, list);
list_del_init(&dirty->list);
- num_blocks = btrfs_root_blocks_used(&dirty->root->root_item);
+ num_blocks = btrfs_root_used(&dirty->root->root_item);
root = dirty->latest_root;
while(1) {
trans = btrfs_start_transaction(tree_root, 1);
-
ret = btrfs_drop_snapshot(trans, dirty->root);
if (ret != -EAGAIN) {
break;
&dirty->root->root_item);
if (err)
ret = err;
+ nr = trans->blocks_used;
ret = btrfs_end_transaction(trans, tree_root);
BUG_ON(ret);
mutex_unlock(&tree_root->fs_info->fs_mutex);
-
- btrfs_btree_balance_dirty(tree_root);
+ btrfs_btree_balance_dirty(tree_root, nr);
schedule();
mutex_lock(&tree_root->fs_info->fs_mutex);
}
BUG_ON(ret);
- num_blocks -= btrfs_root_blocks_used(&dirty->root->root_item);
- blocks_used = btrfs_root_blocks_used(&root->root_item);
+ num_blocks -= btrfs_root_used(&dirty->root->root_item);
+ blocks_used = btrfs_root_used(&root->root_item);
if (num_blocks) {
record_root_in_trans(root);
- btrfs_set_root_blocks_used(&root->root_item,
+ btrfs_set_root_used(&root->root_item,
blocks_used - num_blocks);
}
ret = btrfs_del_root(trans, tree_root, &dirty->root->root_key);
BUG();
break;
}
+ nr = trans->blocks_used;
ret = btrfs_end_transaction(trans, tree_root);
BUG_ON(ret);
+ free_extent_buffer(dirty->root->node);
kfree(dirty->root);
kfree(dirty);
mutex_unlock(&tree_root->fs_info->fs_mutex);
- btrfs_btree_balance_dirty(tree_root);
+
+ btrfs_btree_balance_dirty(tree_root, nr);
schedule();
}
return ret;
btrfs_set_super_generation(&root->fs_info->super_copy,
cur_trans->transid);
btrfs_set_super_root(&root->fs_info->super_copy,
- bh_blocknr(root->fs_info->tree_root->node));
- memcpy(root->fs_info->disk_super, &root->fs_info->super_copy,
- sizeof(root->fs_info->super_copy));
+ extent_buffer_blocknr(root->fs_info->tree_root->node));
+
+ write_extent_buffer(root->fs_info->sb_buffer,
+ &root->fs_info->super_copy, 0,
+ sizeof(root->fs_info->super_copy));
btrfs_copy_pinned(root, &pinned_copy);
projects / linux-2.6-block.git / blobdiff