diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-17 02:06:19 +0100 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-26 03:30:54 +0100 |
| commit | bf6bf606e545cb31c29499b354c13b2621acd649 (patch) | |
| tree | 237329d42ac5e126d273a31606f9258b04155348 /fs/orangefs/file.c | |
| parent | orangefs: get rid of readdir_handle_s (diff) | |
| download | linux-bf6bf606e545cb31c29499b354c13b2621acd649.tar.xz linux-bf6bf606e545cb31c29499b354c13b2621acd649.zip | |
orangefs_copy_{to,from}_bufmap(): don't pass bufmap pointer
it's always __orangefs_bufmap
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/file.c')
| -rw-r--r-- | fs/orangefs/file.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index d4a00ad26f6e..db9dd6ebcc3f 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -21,8 +21,7 @@ * can futher be kernel-space or user-space addresses. * or it can pointers to struct page's */ -static int precopy_buffers(struct orangefs_bufmap *bufmap, - int buffer_index, +static int precopy_buffers(int buffer_index, struct iov_iter *iter, size_t total_size) { @@ -34,8 +33,7 @@ static int precopy_buffers(struct orangefs_bufmap *bufmap, if (total_size) { - ret = orangefs_bufmap_copy_from_iovec(bufmap, - iter, + ret = orangefs_bufmap_copy_from_iovec(iter, buffer_index, total_size); if (ret < 0) @@ -58,8 +56,7 @@ static int precopy_buffers(struct orangefs_bufmap *bufmap, * can futher be kernel-space or user-space addresses. * or it can pointers to struct page's */ -static int postcopy_buffers(struct orangefs_bufmap *bufmap, - int buffer_index, +static int postcopy_buffers(int buffer_index, struct iov_iter *iter, size_t total_size) { @@ -70,8 +67,7 @@ static int postcopy_buffers(struct orangefs_bufmap *bufmap, * struct page pointers. */ if (total_size) { - ret = orangefs_bufmap_copy_to_iovec(bufmap, - iter, + ret = orangefs_bufmap_copy_to_iovec(iter, buffer_index, total_size); if (ret < 0) @@ -138,8 +134,7 @@ populate_shared_memory: * precopy_buffers only pertains to writes. */ if (type == ORANGEFS_IO_WRITE) { - ret = precopy_buffers(bufmap, - buffer_index, + ret = precopy_buffers(buffer_index, iter, total_size); if (ret < 0) @@ -242,8 +237,7 @@ populate_shared_memory: * postcopy_buffers only pertains to reads. */ if (type == ORANGEFS_IO_READ) { - ret = postcopy_buffers(bufmap, - buffer_index, + ret = postcopy_buffers(buffer_index, iter, new_op->downcall.resp.io.amt_complete); if (ret < 0) |