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

Commit 3a83b342 authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: complete the rest request through buffer io 



Complte the rest request thourgh buffer io after direct write performed.

Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Weiwei Wang <wangww631@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Xuejiufei <xuejiufei@huawei.com>
Cc: alex chen <alex.chen@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d943d59d

fs/ocfs2/file.c

+42 −1
Original line number Diff line number Diff line
@@ -2253,6 +2253,7 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, 
	u32 old_clusters;

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(file);

	struct address_space *mapping = file->f_mapping;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	int full_coherency = !(osb->s_mount_opt &

			       OCFS2_MOUNT_COHERENCY_BUFFERED);
@@ -2367,11 +2368,51 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, 


	iov_iter_truncate(from, count);

	if (direct_io) {

		loff_t endbyte;

		ssize_t written_buffered;

		written = generic_file_direct_write(iocb, from, *ppos);

		if (written < 0) {

		if (written < 0 || written == count) {

			ret = written;

			goto out_dio;

		}



		/*

		 * for completing the rest of the request.

		 */

		*ppos += written;

		count -= written;

		written_buffered = generic_perform_write(file, from, *ppos);

		/*

		 * If generic_file_buffered_write() returned a synchronous error

		 * then we want to return the number of bytes which were

		 * direct-written, or the error code if that was zero. Note

		 * that this differs from normal direct-io semantics, which

		 * will return -EFOO even if some bytes were written.

		 */

		if (written_buffered < 0) {

			ret = written_buffered;

			goto out_dio;

		}



		iocb->ki_pos = *ppos + written_buffered;

		/* We need to ensure that the page cache pages are written to

		 * disk and invalidated to preserve the expected O_DIRECT

		 * semantics.

		 */

		endbyte = *ppos + written_buffered - 1;

		ret = filemap_write_and_wait_range(file->f_mapping, *ppos,

				endbyte);

		if (ret == 0) {

			written += written_buffered;

			invalidate_mapping_pages(mapping,

					*ppos >> PAGE_CACHE_SHIFT,

					endbyte >> PAGE_CACHE_SHIFT);

		} else {

			/*

			 * We don't know how much we wrote, so just return

			 * the number of bytes which were direct-written

			 */

		}

	} else {

		current->backing_dev_info = inode_to_bdi(inode);

		written = generic_perform_write(file, from, *ppos);