From 2389739b47ecb6bc8b4dc1f53f251ecb81ddf0fc Mon Sep 17 00:00:00 2001 From: Konrad Lipinski Date: Wed, 16 Nov 2016 16:24:16 +0100 Subject: [PATCH] kdbus: kdbus_pool_slice_copy_iovec: remove unnecessary argument (off) --- ipc/kdbus/message.c | 4 ++-- ipc/kdbus/pool.c | 7 +++---- ipc/kdbus/pool.h | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ipc/kdbus/message.c b/ipc/kdbus/message.c index ff2d56c130df..0ef7b33de621 100644 --- a/ipc/kdbus/message.c +++ b/ipc/kdbus/message.c @@ -700,7 +700,7 @@ struct kdbus_pool_slice *kdbus_staging_user_emit(struct kdbus_staging_user *__re kdbus_assert(kdbus_pool_slice_size(slice) == size); - ret = kdbus_pool_slice_copy_iovec(&dst->pool, slice, 0, parts, + ret = kdbus_pool_slice_copy_iovec(&dst->pool, slice, parts, staging->n_parts, size); if (ret >= 0) /* all done, return slice to caller */ goto exit; @@ -757,7 +757,7 @@ struct kdbus_pool_slice *kdbus_staging_kernel_emit(struct kdbus_staging_kernel * kdbus_assert(kdbus_pool_slice_size(slice) == size); - if (0 <= (ret = kdbus_pool_slice_copy_iovec(&dst->pool, slice, 0, &iov, 1, size))) /* all done, return slice to caller */ + if (0 <= (ret = kdbus_pool_slice_copy_iovec(&dst->pool, slice, &iov, 1, size))) /* all done, return slice to caller */ goto exit; kdbus_pool_slice_release(&dst->pool, slice); diff --git a/ipc/kdbus/pool.c b/ipc/kdbus/pool.c index be56b324fb18..769ef023c398 100644 --- a/ipc/kdbus/pool.c +++ b/ipc/kdbus/pool.c @@ -483,18 +483,17 @@ void kdbus_pool_accounted(struct kdbus_pool *pool, unsigned *size, unsigned *acc * Return: the numbers of bytes copied, negative errno on failure. */ int -kdbus_pool_slice_copy_iovec(struct kdbus_pool *pool, const struct kdbus_pool_slice *slice, unsigned off, +kdbus_pool_slice_copy_iovec(struct kdbus_pool *pool, const struct kdbus_pool_slice *slice, struct iovec *iov, unsigned iov_len, unsigned total_len) { struct iov_iter iter; int len; - kdbus_assert(off + total_len <= slice->size); + kdbus_assert(total_len <= slice->size); - off += slice->off; iov_iter_init(&iter, WRITE, iov, iov_len, total_len); { - loff_t off_ = off; + loff_t off_ = slice->off; len = vfs_iter_write(pool->f, &iter, &off_, 0); } diff --git a/ipc/kdbus/pool.h b/ipc/kdbus/pool.h index 91f1f1885ccf..7a8f2806e619 100644 --- a/ipc/kdbus/pool.h +++ b/ipc/kdbus/pool.h @@ -109,7 +109,6 @@ wur int kdbus_pool_slice_copy_kvec(struct kdbus_pool *pool, const struct kdbus_p unsigned off, struct kvec *kvec, unsigned kvec_count, unsigned total_len); wur int kdbus_pool_slice_copy_iovec(struct kdbus_pool *pool, const struct kdbus_pool_slice *slice, - unsigned off, struct iovec *iov, - unsigned iov_count, unsigned total_len); + struct iovec *iov, unsigned iov_count, unsigned total_len); #endif -- 2.34.1