diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/extents.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 6950babecde7..76c2df382b7d 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -5404,16 +5404,13 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) | |||
5404 | int ret; | 5404 | int ret; |
5405 | 5405 | ||
5406 | /* Collapse range works only on fs block size aligned offsets. */ | 5406 | /* Collapse range works only on fs block size aligned offsets. */ |
5407 | if (offset & (EXT4_BLOCK_SIZE(sb) - 1) || | 5407 | if (offset & (EXT4_CLUSTER_SIZE(sb) - 1) || |
5408 | len & (EXT4_BLOCK_SIZE(sb) - 1)) | 5408 | len & (EXT4_CLUSTER_SIZE(sb) - 1)) |
5409 | return -EINVAL; | 5409 | return -EINVAL; |
5410 | 5410 | ||
5411 | if (!S_ISREG(inode->i_mode)) | 5411 | if (!S_ISREG(inode->i_mode)) |
5412 | return -EINVAL; | 5412 | return -EINVAL; |
5413 | 5413 | ||
5414 | if (EXT4_SB(inode->i_sb)->s_cluster_ratio > 1) | ||
5415 | return -EOPNOTSUPP; | ||
5416 | |||
5417 | trace_ext4_collapse_range(inode, offset, len); | 5414 | trace_ext4_collapse_range(inode, offset, len); |
5418 | 5415 | ||
5419 | punch_start = offset >> EXT4_BLOCK_SIZE_BITS(sb); | 5416 | punch_start = offset >> EXT4_BLOCK_SIZE_BITS(sb); |