Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 508d7c0e authored by Chengguang Xu's avatar Chengguang Xu Committed by Jaegeuk Kim
Browse files

f2fs: remove redundant check in f2fs_file_write_iter() 



We have already checked flag IOCB_DIRECT in the sanity
check of flag IOCB_NOWAIT, so don't have to check it
again here.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent a6811975

fs/f2fs/file.c

+9 −13
Original line number Diff line number Diff line
@@ -3063,20 +3063,16 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		if (iov_iter_fault_in_readable(from, iov_iter_count(from)))

			set_inode_flag(inode, FI_NO_PREALLOC);



		if ((iocb->ki_flags & IOCB_NOWAIT) &&

			(iocb->ki_flags & IOCB_DIRECT)) {

		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)) {

						clear_inode_flag(inode,

								FI_NO_PREALLOC);

				f2fs_force_buffered_io(inode, iocb, from)) {

				clear_inode_flag(inode, FI_NO_PREALLOC);

				inode_unlock(inode);

				ret = -EAGAIN;

				goto out;

			}



		} else {

			preallocated = true;

			target_size = iocb->ki_pos + iov_iter_count(from);