1 files changed, 4 insertions, 3 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 184bde1cfc3d..bfa4149c053d 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -507,11 +507,12 @@ next_slot:
                 slot = path->slots[0];
                 ret = 0;
                 btrfs_item_key_to_cpu(leaf, &key, slot);
-
-                if (key.offset >= end || key.objectid != inode->i_ino) {
+                if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY &&
+                    key.offset >= end) {
                         goto out;
                 }
-                if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY) {
+                if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY ||
+                    key.objectid != inode->i_ino) {
                         goto out;
                 }
                 if (recow) {