kdbus: kdbus_pool_slice_copy_iovec: remove unnecessary argument (off)

diff --git a/ipc/kdbus/message.c b/ipc/kdbus/message.c
index ff2d56c130df1729d55ed3aa93bb64e36f8a0b71..0ef7b33de621bc9a9bf270831ee1eced348c887c 100644 (file)
--- 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 be56b324fb18bd5fd6e4210f7e83828baccb3b54..769ef023c398d58a623e69c203da568eb7c87dc4 100644 (file)
--- 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 91f1f1885ccfc3e29b77291a17d6093ca9b98992..7a8f2806e6196fa7ecdb23995eb59d3d5c6444ea 100644 (file)
--- 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