projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[cascardo/linux.git]
/
fs
/
btrfs
/
tree-defrag.c
diff --git
a/fs/btrfs/tree-defrag.c
b/fs/btrfs/tree-defrag.c
index
3e8358c
..
98d25fa
100644
(file)
--- a/
fs/btrfs/tree-defrag.c
+++ b/
fs/btrfs/tree-defrag.c
@@
-74,6
+74,7
@@
int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
u32 nritems;
root_node = btrfs_lock_root_node(root);
+ btrfs_set_lock_blocking(root_node);
nritems = btrfs_header_nritems(root_node);
root->defrag_max.objectid = 0;
/* from above we know this is not a leaf */