aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2014-04-01 00:59:21 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-04-01 00:59:21 -0400
commite5b30416f3631bf4eed37c3bec9f789f9ae78446 (patch)
tree3db5a4e171befe59982748f1e6edd2b1acc75bc5 /fs
parente04027e887c37b670e30a3f29fde8bfbeba56abc (diff)
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')
-rw-r--r--fs/ext4/extents.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 464e95da716e..c92ef8735ba2 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,
4816 4816
4817 inode->i_mtime = inode->i_ctime = ext4_current_time(inode); 4817 inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
4818 4818
4819 if (!ret && new_size) { 4819 if (new_size) {
4820 if (new_size > i_size_read(inode)) 4820 if (new_size > i_size_read(inode))
4821 i_size_write(inode, new_size); 4821 i_size_write(inode, new_size);
4822 if (new_size > EXT4_I(inode)->i_disksize) 4822 if (new_size > EXT4_I(inode)->i_disksize)
4823 ext4_update_i_disksize(inode, new_size); 4823 ext4_update_i_disksize(inode, new_size);
4824 } else if (!ret && !new_size) { 4824 } else {
4825 /* 4825 /*
4826 * Mark that we allocate beyond EOF so the subsequent truncate 4826 * Mark that we allocate beyond EOF so the subsequent truncate
4827 * can proceed even if the new size is the same as i_size. 4827 * 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)
4923 4923
4924 tv = inode->i_ctime = ext4_current_time(inode); 4924 tv = inode->i_ctime = ext4_current_time(inode);
4925 4925
4926 if (!ret && new_size) { 4926 if (new_size) {
4927 if (new_size > i_size_read(inode)) { 4927 if (new_size > i_size_read(inode)) {
4928 i_size_write(inode, new_size); 4928 i_size_write(inode, new_size);
4929 inode->i_mtime = tv; 4929 inode->i_mtime = tv;
4930 } 4930 }
4931 if (new_size > EXT4_I(inode)->i_disksize) 4931 if (new_size > EXT4_I(inode)->i_disksize)
4932 ext4_update_i_disksize(inode, new_size); 4932 ext4_update_i_disksize(inode, new_size);
4933 } else if (!ret && !new_size) { 4933 } else {
4934 /* 4934 /*
4935 * Mark that we allocate beyond EOF so the subsequent truncate 4935 * Mark that we allocate beyond EOF so the subsequent truncate
4936 * can proceed even if the new size is the same as i_size. 4936 * can proceed even if the new size is the same as i_size.