diff --git a/[refs] b/[refs] index 8fb2f8a4ef2b..5941cb9ce127 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee6e6504e147a59a9f4d582662c105e9d72ae638 +refs/heads/master: 0bd40a718444b28793283b70286f9e29d464a189 diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c index bbf9bf374066..cdc713062b03 100644 --- a/trunk/fs/btrfs/ctree.c +++ b/trunk/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);