diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2014-04-01 00:59:21 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-04-01 00:59:21 -0400 |
| commit | e5b30416f3631bf4eed37c3bec9f789f9ae78446 (patch) | |
| tree | 3db5a4e171befe59982748f1e6edd2b1acc75bc5 /fs/ext4 | |
| parent | e04027e887c37b670e30a3f29fde8bfbeba56abc (diff) | |
| download | op-kernel-dev-e5b30416f3631bf4eed37c3bec9f789f9ae78446.zip op-kernel-dev-e5b30416f3631bf4eed37c3bec9f789f9ae78446.tar.gz | |
ext4: remove unneeded test of ret variable
Currently in ext4_fallocate() and ext4_zero_range() we're testing ret
variable along with new_size. However in ext4_fallocate() we just tested
ret before and in ext4_zero_range() if will always be zero when we get
there so there is no need to test it in both cases.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 464e95d..c92ef87 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4816,12 +4816,12 @@ static long ext4_zero_range(struct file *file, loff_t offset, inode->i_mtime = inode->i_ctime = ext4_current_time(inode); - if (!ret && new_size) { + if (new_size) { if (new_size > i_size_read(inode)) i_size_write(inode, new_size); if (new_size > EXT4_I(inode)->i_disksize) ext4_update_i_disksize(inode, new_size); - } else if (!ret && !new_size) { + } else { /* * Mark that we allocate beyond EOF so the subsequent truncate * can proceed even if the new size is the same as i_size. @@ -4923,14 +4923,14 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) tv = inode->i_ctime = ext4_current_time(inode); - if (!ret && new_size) { + if (new_size) { if (new_size > i_size_read(inode)) { i_size_write(inode, new_size); inode->i_mtime = tv; } if (new_size > EXT4_I(inode)->i_disksize) ext4_update_i_disksize(inode, new_size); - } else if (!ret && !new_size) { + } else { /* * Mark that we allocate beyond EOF so the subsequent truncate * can proceed even if the new size is the same as i_size. |
