aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-10-26 16:53:47 +0100
committerKevin Wolf <kwolf@redhat.com>2018-12-14 11:52:41 +0100
commit5d5de250056b0972cde2e88133db702960a32b72 (patch)
tree8795d39597b55017c521009ea5e7b884c7ba440e /block
parentd57c44d00f0daddd6d31b326ef844bf2facf6d8a (diff)
file-posix: Factor out raw_thread_pool_submit()
Getting the thread pool of the AioContext of a block node and scheduling some work in it is an operation that is already done twice, and we'll get more instances. Factor it out into a separate function. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/file-posix.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/block/file-posix.c b/block/file-posix.c
index d0102a7ec0..27be94cfe5 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1824,13 +1824,20 @@ static int aio_worker(void *arg)
return ret;
}
+static int coroutine_fn raw_thread_pool_submit(BlockDriverState *bs,
+ ThreadPoolFunc func, void *arg)
+{
+ /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
+ ThreadPool *pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
+ return thread_pool_submit_co(pool, func, arg);
+}
+
static int paio_submit_co_full(BlockDriverState *bs, int fd,
int64_t offset, int fd2, int64_t offset2,
QEMUIOVector *qiov,
int bytes, int type)
{
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
- ThreadPool *pool;
acb->bs = bs;
acb->aio_type = type;
@@ -1849,8 +1856,7 @@ static int paio_submit_co_full(BlockDriverState *bs, int fd,
}
trace_file_paio_submit_co(offset, bytes, type);
- pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
- return thread_pool_submit_co(pool, aio_worker, acb);
+ return raw_thread_pool_submit(bs, aio_worker, acb);
}
static inline int paio_submit_co(BlockDriverState *bs, int fd,
@@ -1976,7 +1982,6 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
PreallocMode prealloc, Error **errp)
{
RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
- ThreadPool *pool;
*acb = (RawPosixAIOData) {
.bs = bs,
@@ -1989,9 +1994,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
},
};
- /* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
- pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
- return thread_pool_submit_co(pool, aio_worker, acb);
+ return raw_thread_pool_submit(bs, aio_worker, acb);
}
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,