summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2011-06-22 10:51:09 +0200
committerJan Kara <jack@suse.cz>2011-06-25 17:29:53 +0200
commit2c2ea9451fc2a12ee57c8346f0da26969d07ee7f (patch)
tree060666a2cdacc6d5b1f1c10982be0053ac6f9855 /fs
parent81fe8c62febade6b5d0915269b06a0c50448da27 (diff)
downloadop-kernel-dev-2c2ea9451fc2a12ee57c8346f0da26969d07ee7f.zip
op-kernel-dev-2c2ea9451fc2a12ee57c8346f0da26969d07ee7f.tar.gz
ext3: Return -EINVAL when start is beyond the end of fs in ext3_trim_fs()
We should return -EINVAL when the FITRIM parameters are not sane, but currently we are exiting silently if start is beyond the end of the file system. This commit fixes this so we return -EINVAL as other file systems do. Signed-off-by: Lukas Czerner <lczerner@redhat.com> CC: Jan Kara <jack@suse.cz> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/balloc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index f7d111e..6386d76 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -2108,7 +2108,7 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
if (unlikely(minlen > EXT3_BLOCKS_PER_GROUP(sb)))
return -EINVAL;
if (start >= max_blks)
- goto out;
+ return -EINVAL;
if (start + len > max_blks)
len = max_blks - start;
@@ -2156,8 +2156,6 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
if (ret >= 0)
ret = 0;
-
-out:
range->len = trimmed * sb->s_blocksize;
return ret;
OpenPOWER on IntegriCloud