From: Zhang Yi <yi.zhang@xxxxxxxxxx> For the extents inodes, the maxbytes should be sb->s_maxbytes instead of sbi->s_bitmap_maxbytes. Correct the maxbytes value to correct the behavior of punch hole. Fixes: 2da376228a24 ("ext4: limit length to bitmap_maxbytes - blocksize in punch_hole") Signed-off-by: Zhang Yi <yi.zhang@xxxxxxxxxx> --- fs/ext4/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 4ec4a80b6879..f9725e6347c7 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4006,7 +4006,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) struct inode *inode = file_inode(file); struct super_block *sb = inode->i_sb; ext4_lblk_t start_lblk, end_lblk; - loff_t max_end = EXT4_SB(sb)->s_bitmap_maxbytes - sb->s_blocksize; + loff_t max_end; loff_t end = offset + length; handle_t *handle; unsigned int credits; @@ -4015,6 +4015,12 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) trace_ext4_punch_hole(inode, offset, length, 0); WARN_ON_ONCE(!inode_is_locked(inode)); + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + max_end = sb->s_maxbytes; + else + max_end = EXT4_SB(sb)->s_bitmap_maxbytes; + max_end -= sb->s_blocksize; + /* No need to punch hole beyond i_size */ if (offset >= inode->i_size || offset >= max_end) return 0; -- 2.46.1