Commit fc32a72d authored by Jeff Cody's avatar Jeff Cody Committed by Kevin Wolf
Browse files

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: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent e971aa12

block/raw-posix.c

+35 −18
Original line number Diff line number Diff line
@@ -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;

    if (raw_set_aio(&s->aio_ctx, &s->use_aio, bdrv_flags)) {

        goto out_close;

    }

        s->use_aio = 1;

    } else

#endif

    {

#ifdef CONFIG_LINUX_AIO

        s->use_aio = 0;

#endif

    }



#ifdef CONFIG_XFS

    if (platform_test_xfs_fd(s->fd)) {