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

Commit 64130200 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: remove redundant block plug 



For buffered IO, we don't need to use block plug to cache bio,
for direct IO, generic f2fs_direct_IO has already added block
plug, so let's remove redundant one in .write_iter.

As Yunlei described in his patch:

-f2fs_file_write_iter
  -blk_start_plug
    -__generic_file_write_iter
	...
	  -do_blockdev_direct_IO
	    -blk_start_plug
		...
	    -blk_finish_plug
	...
  -blk_finish_plug

which may conduct performance decrease in our platform

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6cea5b25

fs/f2fs/file.c

+0 −3
Original line number Diff line number Diff line
@@ -2703,7 +2703,6 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct inode *inode = file_inode(file);

	size_t count = iov_iter_count(from);

	loff_t pos = iocb->ki_pos;

	struct blk_plug plug;

	ssize_t ret;



	if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
@@ -2729,9 +2728,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
			inode_unlock(inode);

			return err;

		}

		blk_start_plug(&plug);

		ret = __generic_file_write_iter(iocb, from);

		blk_finish_plug(&plug);

		clear_inode_flag(inode, FI_NO_PREALLOC);



		/* if we couldn't write data, we should deallocate blocks. */