diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /fs/btrfs/tree-defrag.c | |
| parent | Merge branches 'sched/rt' and 'sched/urgent' into sched/core (diff) | |
| parent | Linux 2.6.29-rc4 (diff) | |
| download | wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.tar.xz wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.zip | |
Merge commit 'v2.6.29-rc4' into sched/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 */ |