hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

orangefs: make precopy_buffers() take iov_iter 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Al Viro 2015-10-08 17:54:31 -04:00 committed by Mike Marshall
parent 5f0e3c953f
commit a5c126a522
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/orangefs/file.c
View File

@ -31,13 +31,10 @@ do { \
*/ */
static int precopy_buffers(struct pvfs2_bufmap *bufmap, static int precopy_buffers(struct pvfs2_bufmap *bufmap,
int buffer_index, int buffer_index,
const struct iovec *vec, struct iov_iter *iter,
unsigned long nr_segs,
size_t total_size) size_t total_size)
{ {
int ret = 0; int ret = 0;
struct iov_iter iter;
/* /*
* copy data from application/kernel by pulling it out * copy data from application/kernel by pulling it out
* of the iovec. * of the iovec.
@ -45,9 +42,8 @@ static int precopy_buffers(struct pvfs2_bufmap *bufmap,
if (total_size) { if (total_size) {
iov_iter_init(&iter, WRITE, vec, nr_segs, total_size);
ret = pvfs_bufmap_copy_from_iovec(bufmap, ret = pvfs_bufmap_copy_from_iovec(bufmap,
&iter, iter,
buffer_index, buffer_index,
total_size); total_size);
if (ret < 0) if (ret < 0)
@ -152,10 +148,11 @@ populate_shared_memory:
* precopy_buffers only pertains to writes. * precopy_buffers only pertains to writes.
*/ */
if (type == PVFS_IO_WRITE) { if (type == PVFS_IO_WRITE) {
struct iov_iter iter;
iov_iter_init(&iter, WRITE, vec, nr_segs, total_size);
ret = precopy_buffers(bufmap, ret = precopy_buffers(bufmap,
buffer_index, buffer_index,
vec, &iter,
nr_segs,
total_size); total_size);
if (ret < 0) if (ret < 0)
goto out; goto out;