diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:32:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:32:48 +0100 |
| commit | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (patch) | |
| tree | a8684d4ecbfe1d2b2b1e29ed74de65394ad21b43 /fs/btrfs/tree-defrag.c | |
| parent | 304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into tracing/core
Diffstat (limited to 'fs/btrfs/tree-defrag.c')
| -rw-r--r-- | fs/btrfs/tree-defrag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c index 3e8358c36165..98d25fa4570e 100644 --- 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 */ |