1 files changed, 12 insertions, 4 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 6bd5ce9d75f0..977e715f0bf2 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -756,8 +756,16 @@ next_slot:
                 }
 
                 btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
-                if (key.objectid > ino ||
-                    key.type > BTRFS_EXTENT_DATA_KEY || key.offset >= end)
+
+                if (key.objectid > ino)
+                        break;
+                if (WARN_ON_ONCE(key.objectid < ino) ||
+                    key.type < BTRFS_EXTENT_DATA_KEY) {
+                        ASSERT(del_nr == 0);
+                        path->slots[0]++;
+                        goto next_slot;
+                }
+                if (key.type > BTRFS_EXTENT_DATA_KEY || key.offset >= end)
                         break;
 
                 fi = btrfs_item_ptr(leaf, path->slots[0],
@@ -776,8 +784,8 @@ next_slot:
                                 btrfs_file_extent_inline_len(leaf,
                                                      path->slots[0], fi);
                 } else {
-                        WARN_ON(1);
-                        extent_end = search_start;
+                        /* can't happen */
+                        BUG();
                 }
 
                 /*