[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/42] nbd: use BlockDriverState refcnt
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 16/42] nbd: use BlockDriverState refcnt |
Date: |
Fri, 6 Sep 2013 17:38:47 +0200 |
From: Fam Zheng <address@hidden>
Previously, nbd calls drive_get_ref() on the drive of bs. A BDS doesn't
always have associated dinfo, which nbd doesn't care either. We already
have BDS ref count, so use it to make it safe for a BDS w/o blockdev.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev-nbd.c | 10 +---------
nbd.c | 5 +++++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 95f10c8..922cf56 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -69,12 +69,6 @@ static void nbd_close_notifier(Notifier *n, void *data)
g_free(cn);
}
-static void nbd_server_put_ref(NBDExport *exp)
-{
- BlockDriverState *bs = nbd_export_get_blockdev(exp);
- drive_put_ref(drive_get_by_blockdev(bs));
-}
-
void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
Error **errp)
{
@@ -105,11 +99,9 @@ void qmp_nbd_server_add(const char *device, bool
has_writable, bool writable,
writable = false;
}
- exp = nbd_export_new(bs, 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY,
- nbd_server_put_ref);
+ exp = nbd_export_new(bs, 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY, NULL);
nbd_export_set_name(exp, device);
- drive_get_ref(drive_get_by_blockdev(bs));
n = g_malloc0(sizeof(NBDCloseNotifier));
n->n.notify = nbd_close_notifier;
diff --git a/nbd.c b/nbd.c
index 0fd0583..f847940 100644
--- a/nbd.c
+++ b/nbd.c
@@ -882,6 +882,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t
dev_offset,
exp->nbdflags = nbdflags;
exp->size = size == -1 ? bdrv_getlength(bs) : size;
exp->close = close;
+ bdrv_ref(bs);
return exp;
}
@@ -928,6 +929,10 @@ void nbd_export_close(NBDExport *exp)
}
nbd_export_set_name(exp, NULL);
nbd_export_put(exp);
+ if (exp->bs) {
+ bdrv_unref(exp->bs);
+ exp->bs = NULL;
+ }
}
void nbd_export_get(NBDExport *exp)
--
1.8.3.1
- [Qemu-devel] [PULL 35/42] docs, qapi: document qemu-img map, (continued)
- [Qemu-devel] [PULL 35/42] docs, qapi: document qemu-img map, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 36/42] raw-posix: return get_block_status data and flags, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 37/42] raw-posix: report unwritten extents as zero, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 38/42] block: add default get_block_status implementation for protocols, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 39/42] block: look for zero blocks in bs->file, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 40/42] dataplane: Fix startup race., Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 41/42] qemu-iotests: Whitespace cleanup, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 42/42] qemu-iotests: Fixed test case 026, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 18/42] qmp: Documentation for BLOCK_IMAGE_CORRUPTED, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 20/42] cow: make writes go at a less indecent speed, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 16/42] nbd: use BlockDriverState refcnt,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 25/42] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 26/42] block: expect errors from bdrv_co_is_allocated, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 22/42] block: keep bs->total_sectors up to date even for growable block devices, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 23/42] block: make bdrv_co_is_allocated static, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 21/42] cow: do not call bdrv_co_is_allocated, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 24/42] block: do not use ->total_sectors in bdrv_co_is_allocated, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 19/42] cow: make reads go at a decent speed, Stefan Hajnoczi, 2013/09/06
- [Qemu-devel] [PULL 17/42] block: use BDS ref for block jobs, Stefan Hajnoczi, 2013/09/06