From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMCQH-0006ZC-Jl for qemu-devel@nongnu.org; Mon, 03 Aug 2015 05:52:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMCQE-0002Xh-EZ for qemu-devel@nongnu.org; Mon, 03 Aug 2015 05:52:45 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 3 Aug 2015 11:52:37 +0200 Message-Id: <1438595557-28144-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] sheepdog: remove back pointer to BlockDriverState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mitake.hitoshi@lab.ntt.co.jp, namei.unix@gmail.com, jcody@redhat.com, qemu-block@nongnu.org Since sheepdog does not implement a rebind callback, this back pointer is dangerous. Do not use it. Signed-off-by: Paolo Bonzini --- block/sheepdog.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 9585beb..68f1a0d 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -346,7 +346,6 @@ struct SheepdogAIOCB { }; typedef struct BDRVSheepdogState { - BlockDriverState *bs; AioContext *aio_context; SheepdogInode inode; @@ -738,7 +737,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque) if (s->fd < 0) { DPRINTF("Wait for connection to be established\n"); error_report_err(local_err); - co_aio_sleep_ns(bdrv_get_aio_context(s->bs), QEMU_CLOCK_REALTIME, + co_aio_sleep_ns(s->aio_context, QEMU_CLOCK_REALTIME, 1000000000ULL); } }; @@ -1392,7 +1391,6 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags, Error *local_err = NULL; const char *filename; - s->bs = bs; s->aio_context = bdrv_get_aio_context(bs); opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); -- 2.4.3