diff options
| author | Jeff Cody <jcody@redhat.com> | 2012-09-20 15:13:20 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-09-24 15:15:11 +0200 |
| commit | fc32a72dc19a79f7e16156784b1e76a128d41841 (patch) | |
| tree | caffb5c894f8d9ed19801b265685839496c74a56 | |
| parent | e971aa12739f269d6fbfaeabdd4acaeb0f15960b (diff) | |
| download | qemu-fc32a72dc19a79f7e16156784b1e76a128d41841.zip qemu-fc32a72dc19a79f7e16156784b1e76a128d41841.tar.gz qemu-fc32a72dc19a79f7e16156784b1e76a128d41841.tar.bz2 | |
block: move aio initialization into a helper function
Move AIO initialization for raw-posix block driver into a helper function.
In addition to just code motion, the aio_ctx pointer is checked for NULL,
prior to calling laio_init(), to make sure laio_init() is only run once.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/raw-posix.c | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 6be20b1..5981d04 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -185,6 +185,38 @@ static int raw_normalize_devicepath(const char **filename) } #endif +#ifdef CONFIG_LINUX_AIO +static int raw_set_aio(void **aio_ctx, int *use_aio, int bdrv_flags) +{ + int ret = -1; + assert(aio_ctx != NULL); + assert(use_aio != NULL); + /* + * Currently Linux do AIO only for files opened with O_DIRECT + * specified so check NOCACHE flag too + */ + if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == + (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) { + + /* if non-NULL, laio_init() has already been run */ + if (*aio_ctx == NULL) { + *aio_ctx = laio_init(); + if (!*aio_ctx) { + goto error; + } + } + *use_aio = 1; + } else { + *use_aio = 0; + } + + ret = 0; + +error: + return ret; +} +#endif + static int raw_open_common(BlockDriverState *bs, const char *filename, int bdrv_flags, int open_flags) { @@ -240,25 +272,10 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, } #ifdef CONFIG_LINUX_AIO - /* - * Currently Linux do AIO only for files opened with O_DIRECT - * specified so check NOCACHE flag too - */ - if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == - (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) { - - s->aio_ctx = laio_init(); - if (!s->aio_ctx) { - goto out_free_buf; - } - s->use_aio = 1; - } else -#endif - { -#ifdef CONFIG_LINUX_AIO - s->use_aio = 0; -#endif + if (raw_set_aio(&s->aio_ctx, &s->use_aio, bdrv_flags)) { + goto out_close; } +#endif #ifdef CONFIG_XFS if (platform_test_xfs_fd(s->fd)) { |