fs: make generic file read/write functions plug (55602dd6) · Commits · e / devices / android_kernel_oneplus_sm7250

mm/filemap.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1243,12 +1243,15 @@ generic_file_aio_read(struct kiocb iocb, const struct iovec iov,
		unsigned long seg = 0;
		size_t count;
		loff_t *ppos = &iocb->ki_pos;
		struct blk_plug plug;

		count = 0;
		retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
		if (retval)
		return retval;

		blk_start_plug(&plug);

		/* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
		if (filp->f_flags & O_DIRECT) {
		loff_t size;
		@@ -1321,6 +1324,7 @@ generic_file_aio_read(struct kiocb iocb, const struct iovec iov,
		break;
		}
		out:
		blk_finish_plug(&plug);
		return retval;
		}
		EXPORT_SYMBOL(generic_file_aio_read);
		@@ -2432,11 +2436,13 @@ ssize_t generic_file_aio_write(struct kiocb iocb, const struct iovec iov,
		{
		struct file *file = iocb->ki_filp;
		struct inode *inode = file->f_mapping->host;
		struct blk_plug plug;
		ssize_t ret;

		BUG_ON(iocb->ki_pos != pos);

		mutex_lock(&inode->i_mutex);
		blk_start_plug(&plug);
		ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
		mutex_unlock(&inode->i_mutex);

		@@ -2447,6 +2453,7 @@ ssize_t generic_file_aio_write(struct kiocb iocb, const struct iovec iov,
		if (err < 0 && ret > 0)
		ret = err;
		}
		blk_finish_plug(&plug);
		return ret;
		}
		EXPORT_SYMBOL(generic_file_aio_write);