2 files changed, 11 insertions, 2 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 6276add8538a..a85cf7d23309 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1786,10 +1786,12 @@ static noinline int generic_bin_search(struct extent_buffer *eb,
                         if (!err) {
                                 tmp = (struct btrfs_disk_key *)(kaddr + offset -
                                                         map_start);
-                        } else {
+                        } else if (err == 1) {
                                 read_extent_buffer(eb, &unaligned,
                                                    offset, sizeof(unaligned));
                                 tmp = &unaligned;
+                        } else {
+                                return err;
                         }
 
                 } else {
@@ -2830,6 +2832,8 @@ cow_done:
                 }
 
                 ret = key_search(b, key, level, &prev_cmp, &slot);
+                if (ret < 0)
+                        goto done;
 
                 if (level != 0) {
                         int dec = 0;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index aaee3ef55ed8..75533adef998 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -5342,6 +5342,11 @@ int read_extent_buffer_to_user(struct extent_buffer *eb, void __user *dstv,
         return ret;
 }
 
+/*
+ * return 0 if the item is found within a page.
+ * return 1 if the item spans two pages.
+ * return -EINVAL otherwise.
+ */
 int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,
                                unsigned long min_len, char **map,
                                unsigned long *map_start,
@@ -5356,7 +5361,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start,
                 PAGE_SHIFT;
 
         if (i != end_i)
-                return -EINVAL;
+                return 1;
 
         if (i == 0) {
                 offset = start_offset;