Commit 601dc655 authored by Peter Lieven's avatar Peter Lieven Committed by Kevin Wolf
Browse files

block/nfs: tear down aio before nfs_close 



nfs_close is a sync call from libnfs and has its own event
handler polling on the nfs FD. Avoid that both QEMU and libnfs
are intefering here.

CC: qemu-stable@nongnu.org
Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d885ac33

block/nfs.c

+4 −2
Original line number Diff line number Diff line
@@ -390,12 +390,14 @@ static void nfs_attach_aio_context(BlockDriverState *bs, 
static void nfs_client_close(NFSClient *client)

{

    if (client->context) {

        qemu_mutex_lock(&client->mutex);

        aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context),

                           false, NULL, NULL, NULL, NULL);

        qemu_mutex_unlock(&client->mutex);

        if (client->fh) {

            nfs_close(client->context, client->fh);

            client->fh = NULL;

        }

        aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context),

                           false, NULL, NULL, NULL, NULL);

        nfs_destroy_context(client->context);

        client->context = NULL;

    }