ext4: remove unneeded test of ret variable
authorLukas Czerner <lczerner@redhat.com>
Tue, 1 Apr 2014 04:59:21 +0000 (00:59 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 1 Apr 2014 04:59:21 +0000 (00:59 -0400)
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>
fs/ext4/extents.c

index 464e95da716e07b874844df0e39b6edcc1d96c5b..c92ef8735ba2d3558a00c7e7bb2e8b07859b5716 100644 (file)
@@ -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.