diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 07:23:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 07:23:03 -0800 |
| commit | adbfbcd12af3d183957622a99ca009b665639b81 (patch) | |
| tree | 830e5cc6a0dbd5cb590b8484c4234bd65073d1d7 /fs/btrfs/extent-tree.c | |
| parent | fc76be434d90bcd57a0ea6b93a2e66a3fec4b664 (diff) | |
| parent | 23b5c50945f2294add0137799400329c0ebba290 (diff) | |
| download | kernel_samsung_aries-adbfbcd12af3d183957622a99ca009b665639b81.zip kernel_samsung_aries-adbfbcd12af3d183957622a99ca009b665639b81.tar.gz kernel_samsung_aries-adbfbcd12af3d183957622a99ca009b665639b81.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: apply updated fallocate i_size fix
Btrfs: do not try and lookup the file extent when finishing ordered io
Btrfs: Fix oopsen when dropping empty tree.
Btrfs: remove BUG_ON() due to mounting bad filesystem
Btrfs: make error return negative in btrfs_sync_file()
Btrfs: fix race between allocate and release extent buffer.
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 432a2da..559f724 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5402,10 +5402,6 @@ static noinline int walk_down_tree(struct btrfs_trans_handle *trans, int ret; while (level >= 0) { - if (path->slots[level] >= - btrfs_header_nritems(path->nodes[level])) - break; - ret = walk_down_proc(trans, root, path, wc, lookup_info); if (ret > 0) break; @@ -5413,6 +5409,10 @@ static noinline int walk_down_tree(struct btrfs_trans_handle *trans, if (level == 0) break; + if (path->slots[level] >= + btrfs_header_nritems(path->nodes[level])) + break; + ret = do_walk_down(trans, root, path, wc, &lookup_info); if (ret > 0) { path->slots[level]++; |