1 files changed, 9 insertions, 1 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index d74e08029643..e003a1e81dc3 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -377,7 +377,7 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext)
         ext4_lblk_t lblock = le32_to_cpu(ext->ee_block);
         ext4_lblk_t last = lblock + len - 1;
 
-        if (lblock > last)
+        if (len == 0 || lblock > last)
                 return 0;
         return ext4_data_block_valid(EXT4_SB(inode->i_sb), block, len);
 }
@@ -5396,6 +5396,14 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)
         loff_t new_size, ioffset;
         int ret;
 
+        /*
+         * We need to test this early because xfstests assumes that a
+         * collapse range of (0, 1) will return EOPNOTSUPP if the file
+         * system does not support collapse range.
+         */
+        if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
+                return -EOPNOTSUPP;
+
         /* Collapse range works only on fs block size aligned offsets. */
         if (offset & (EXT4_CLUSTER_SIZE(sb) - 1) ||
             len & (EXT4_CLUSTER_SIZE(sb) - 1))