summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason2008-07-17 18:54:43 +0200
committerChris Mason2008-09-25 17:04:04 +0200
commit0bd40a718444b28793283b70286f9e29d464a189 (patch)
tree3260a86b95d060465b46f1cc0ca4691ebdd9d100 /fs
parentAdd a per-inode lock around btrfs_drop_extents (diff)
downloadkernel-qcow2-linux-0bd40a718444b28793283b70286f9e29d464a189.tar.gz
kernel-qcow2-linux-0bd40a718444b28793283b70286f9e29d464a189.tar.xz
kernel-qcow2-linux-0bd40a718444b28793283b70286f9e29d464a189.zip
btrfs_next_leaf: do readahead when skip_locking is turned on
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index bbf9bf374066..cdc713062b03 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3206,7 +3206,8 @@ int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path)
free_extent_buffer(next);
}
- if (level == 1 && path->locks[1] && path->reada)
+ if (level == 1 && (path->locks[1] || path->skip_locking) &&
+ path->reada)
reada_for_search(root, path, level, slot, 0);
next = read_node_slot(root, c, slot);