git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
fs
/
btrfs
/
relocation.c
diff --git
a/fs/btrfs/relocation.c
b/fs/btrfs/relocation.c
index
ca38eca
..
b1ef27c
100644
(file)
--- a/
fs/btrfs/relocation.c
+++ b/
fs/btrfs/relocation.c
@@
-677,6
+677,8
@@
struct backref_node *build_backref_tree(struct reloc_control *rc,
err = -ENOMEM;
goto out;
}
err = -ENOMEM;
goto out;
}
+ path1->reada = 1;
+ path2->reada = 2;
node = alloc_backref_node(cache);
if (!node) {
node = alloc_backref_node(cache);
if (!node) {
@@
-1999,6
+2001,7
@@
static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
+ path->reada = 1;
reloc_root = root->reloc_root;
root_item = &reloc_root->root_item;
reloc_root = root->reloc_root;
root_item = &reloc_root->root_item;
@@
-2139,10
+2142,10
@@
int prepare_to_merge(struct reloc_control *rc, int err)
u64 num_bytes = 0;
int ret;
u64 num_bytes = 0;
int ret;
-
mutex_lock(&root->fs_info->trans_mutex
);
+
spin_lock(&root->fs_info->trans_lock
);
rc->merging_rsv_size += root->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
rc->merging_rsv_size += rc->nodes_relocated * 2;
rc->merging_rsv_size += root->nodesize * (BTRFS_MAX_LEVEL - 1) * 2;
rc->merging_rsv_size += rc->nodes_relocated * 2;
-
mutex_unlock(&root->fs_info->trans_mutex
);
+
spin_unlock(&root->fs_info->trans_lock
);
again:
if (!err) {
num_bytes = rc->merging_rsv_size;
again:
if (!err) {
num_bytes = rc->merging_rsv_size;
@@
-2152,7
+2155,7
@@
again:
err = ret;
}
err = ret;
}
- trans = btrfs_join_transaction(rc->extent_root
, 1
);
+ trans = btrfs_join_transaction(rc->extent_root);
if (IS_ERR(trans)) {
if (!err)
btrfs_block_rsv_release(rc->extent_root,
if (IS_ERR(trans)) {
if (!err)
btrfs_block_rsv_release(rc->extent_root,
@@
-2211,9
+2214,9
@@
int merge_reloc_roots(struct reloc_control *rc)
int ret;
again:
root = rc->extent_root;
int ret;
again:
root = rc->extent_root;
-
mutex_lock(&root->fs_info->trans_mutex
);
+
spin_lock(&root->fs_info->trans_lock
);
list_splice_init(&rc->reloc_roots, &reloc_roots);
list_splice_init(&rc->reloc_roots, &reloc_roots);
-
mutex_unlock(&root->fs_info->trans_mutex
);
+
spin_unlock(&root->fs_info->trans_lock
);
while (!list_empty(&reloc_roots)) {
found = 1;
while (!list_empty(&reloc_roots)) {
found = 1;
@@
-3236,7
+3239,7
@@
truncate:
goto out;
}
goto out;
}
- trans = btrfs_join_transaction(root
, 0
);
+ trans = btrfs_join_transaction(root);
if (IS_ERR(trans)) {
btrfs_free_path(path);
ret = PTR_ERR(trans);
if (IS_ERR(trans)) {
btrfs_free_path(path);
ret = PTR_ERR(trans);
@@
-3300,6
+3303,7
@@
static int find_data_references(struct reloc_control *rc,
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
+ path->reada = 1;
root = read_fs_root(rc->extent_root->fs_info, ref_root);
if (IS_ERR(root)) {
root = read_fs_root(rc->extent_root->fs_info, ref_root);
if (IS_ERR(root)) {
@@
-3586,17
+3590,17
@@
next:
static void set_reloc_control(struct reloc_control *rc)
{
struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
static void set_reloc_control(struct reloc_control *rc)
{
struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
-
mutex_lock(&fs_info->trans_mutex
);
+
spin_lock(&fs_info->trans_lock
);
fs_info->reloc_ctl = rc;
fs_info->reloc_ctl = rc;
-
mutex_unlock(&fs_info->trans_mutex
);
+
spin_unlock(&fs_info->trans_lock
);
}
static void unset_reloc_control(struct reloc_control *rc)
{
struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
}
static void unset_reloc_control(struct reloc_control *rc)
{
struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
-
mutex_lock(&fs_info->trans_mutex
);
+
spin_lock(&fs_info->trans_lock
);
fs_info->reloc_ctl = NULL;
fs_info->reloc_ctl = NULL;
-
mutex_unlock(&fs_info->trans_mutex
);
+
spin_unlock(&fs_info->trans_lock
);
}
static int check_extent_flags(u64 flags)
}
static int check_extent_flags(u64 flags)
@@
-3645,7
+3649,7
@@
int prepare_to_relocate(struct reloc_control *rc)
rc->create_reloc_tree = 1;
set_reloc_control(rc);
rc->create_reloc_tree = 1;
set_reloc_control(rc);
- trans = btrfs_join_transaction(rc->extent_root
, 1
);
+ trans = btrfs_join_transaction(rc->extent_root);
BUG_ON(IS_ERR(trans));
btrfs_commit_transaction(trans, rc->extent_root);
return 0;
BUG_ON(IS_ERR(trans));
btrfs_commit_transaction(trans, rc->extent_root);
return 0;
@@
-3668,6
+3672,7
@@
static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
+ path->reada = 1;
ret = prepare_to_relocate(rc);
if (ret) {
ret = prepare_to_relocate(rc);
if (ret) {
@@
-3834,7
+3839,7
@@
restart:
btrfs_block_rsv_release(rc->extent_root, rc->block_rsv, (u64)-1);
/* get rid of pinned extents */
btrfs_block_rsv_release(rc->extent_root, rc->block_rsv, (u64)-1);
/* get rid of pinned extents */
- trans = btrfs_join_transaction(rc->extent_root
, 1
);
+ trans = btrfs_join_transaction(rc->extent_root);
if (IS_ERR(trans))
err = PTR_ERR(trans);
else
if (IS_ERR(trans))
err = PTR_ERR(trans);
else
@@
-4093,6
+4098,7
@@
int btrfs_recover_relocation(struct btrfs_root *root)
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
+ path->reada = -1;
key.objectid = BTRFS_TREE_RELOC_OBJECTID;
key.type = BTRFS_ROOT_ITEM_KEY;
key.objectid = BTRFS_TREE_RELOC_OBJECTID;
key.type = BTRFS_ROOT_ITEM_KEY;
@@
-4159,7
+4165,7
@@
int btrfs_recover_relocation(struct btrfs_root *root)
set_reloc_control(rc);
set_reloc_control(rc);
- trans = btrfs_join_transaction(rc->extent_root
, 1
);
+ trans = btrfs_join_transaction(rc->extent_root);
if (IS_ERR(trans)) {
unset_reloc_control(rc);
err = PTR_ERR(trans);
if (IS_ERR(trans)) {
unset_reloc_control(rc);
err = PTR_ERR(trans);
@@
-4193,7
+4199,7
@@
int btrfs_recover_relocation(struct btrfs_root *root)
unset_reloc_control(rc);
unset_reloc_control(rc);
- trans = btrfs_join_transaction(rc->extent_root
, 1
);
+ trans = btrfs_join_transaction(rc->extent_root);
if (IS_ERR(trans))
err = PTR_ERR(trans);
else
if (IS_ERR(trans))
err = PTR_ERR(trans);
else