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

Commit a5c126a5 authored by Al Viro's avatar Al Viro Committed by Mike Marshall
Browse files

orangefs: make precopy_buffers() take iov_iter 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 5f0e3c95

fs/orangefs/file.c

+5 −8
Original line number Diff line number Diff line
@@ -31,13 +31,10 @@ do { \ 
 */

static int precopy_buffers(struct pvfs2_bufmap *bufmap,

			   int buffer_index,

			   const struct iovec *vec,

			   unsigned long nr_segs,

			   struct iov_iter *iter,

			   size_t total_size)

{

	int ret = 0;

	struct iov_iter iter;



	/*

	 * copy data from application/kernel by pulling it out

	 * of the iovec.
@@ -45,9 +42,8 @@ static int precopy_buffers(struct pvfs2_bufmap *bufmap, 




	if (total_size) {

		iov_iter_init(&iter, WRITE, vec, nr_segs, total_size);

		ret = pvfs_bufmap_copy_from_iovec(bufmap,

						&iter,

						iter,

						buffer_index,

						total_size);

		if (ret < 0)
@@ -152,10 +148,11 @@ static ssize_t wait_for_direct_io(enum PVFS_io_type type, struct inode *inode, 
	 * precopy_buffers only pertains to writes.

	 */

	if (type == PVFS_IO_WRITE) {

		struct iov_iter iter;

		iov_iter_init(&iter, WRITE, vec, nr_segs, total_size);

		ret = precopy_buffers(bufmap,

				      buffer_index,

				      vec,

				      nr_segs,

				      &iter,

				      total_size);

		if (ret < 0)

			goto out;