f2fs: reduce indentation in f2fs_file_write_iter()
authorEric Biggers <ebiggers@google.com>
Fri, 16 Jul 2021 14:39:14 +0000 (09:39 -0500)
committerJaegeuk Kim <jaegeuk@kernel.org>
Sat, 4 Dec 2021 18:48:53 +0000 (10:48 -0800)
Replace 'if (ret > 0)' with 'if (ret <= 0) goto out_unlock;'.
No change in behavior.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index fc87d0f5b82b0e0620637d4692c74661fc7ae56f..808a7c24d9939c9d10a4f59f18bdc2c9df64c5aa 100644 (file)
@@ -4338,44 +4338,48 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        }
 
        ret = generic_write_checks(iocb, from);
-       if (ret > 0) {
-               if (iocb->ki_flags & IOCB_NOWAIT) {
-                       if (!f2fs_overwrite_io(inode, iocb->ki_pos,
-                                               iov_iter_count(from)) ||
+       if (ret <= 0)
+               goto out_unlock;
+
+       if (iocb->ki_flags & IOCB_NOWAIT) {
+               if (!f2fs_overwrite_io(inode, iocb->ki_pos,
+                                       iov_iter_count(from)) ||
                                f2fs_has_inline_data(inode) ||
                                f2fs_force_buffered_io(inode, iocb, from)) {
-                               ret = -EAGAIN;
-                               goto out_unlock;
-                       }
-               }
-               if (iocb->ki_flags & IOCB_DIRECT) {
-                       ret = f2fs_convert_inline_inode(inode);
-                       if (ret)
-                               goto out_unlock;
-               }
-               /* Possibly preallocate the blocks for the write. */
-               target_size = iocb->ki_pos + iov_iter_count(from);
-               preallocated = f2fs_preallocate_blocks(iocb, from);
-               if (preallocated < 0) {
-                       ret = preallocated;
+                       ret = -EAGAIN;
                        goto out_unlock;
                }
+       }
 
-               ret = __generic_file_write_iter(iocb, from);
+       if (iocb->ki_flags & IOCB_DIRECT) {
+               ret = f2fs_convert_inline_inode(inode);
+               if (ret)
+                       goto out_unlock;
+       }
+       /* Possibly preallocate the blocks for the write. */
+       target_size = iocb->ki_pos + iov_iter_count(from);
+       preallocated = f2fs_preallocate_blocks(iocb, from);
+       if (preallocated < 0) {
+               ret = preallocated;
+               goto out_unlock;
+       }
 
-               /* Don't leave any preallocated blocks around past i_size. */
-               if (preallocated > 0 && i_size_read(inode) < target_size) {
-                       down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-                       filemap_invalidate_lock(inode->i_mapping);
-                       f2fs_truncate(inode);
-                       filemap_invalidate_unlock(inode->i_mapping);
-                       up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-               }
-               clear_inode_flag(inode, FI_PREALLOCATED_ALL);
+       ret = __generic_file_write_iter(iocb, from);
 
-               if (ret > 0)
-                       f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret);
+       /* Don't leave any preallocated blocks around past i_size. */
+       if (preallocated > 0 && i_size_read(inode) < target_size) {
+               down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
+               filemap_invalidate_lock(inode->i_mapping);
+               f2fs_truncate(inode);
+               filemap_invalidate_unlock(inode->i_mapping);
+               up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
        }
+
+       clear_inode_flag(inode, FI_PREALLOCATED_ALL);
+
+       if (ret > 0)
+               f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret);
+
 out_unlock:
        inode_unlock(inode);
 out: