[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 2/8] 9p: Simplify error path of v9fs_device_realize_common()
From: |
Greg Kurz |
Subject: |
[PULL v2 2/8] 9p: Simplify error path of v9fs_device_realize_common() |
Date: |
Thu, 10 Oct 2019 15:18:03 +0200 |
Make v9fs_device_unrealize_common() idempotent and use it for rollback,
in order to reduce code duplication.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/9pfs/9p-local.c | 4 ++++
hw/9pfs/9p-proxy.c | 4 ++++
hw/9pfs/9p.c | 16 ++++++----------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 08e673a79c22..6f7309f4e691 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1465,6 +1465,10 @@ static void local_cleanup(FsContext *ctx)
{
LocalData *data = ctx->private;
+ if (!data) {
+ return;
+ }
+
close(data->mountfd);
g_free(data);
}
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 57a8c1c80886..97ab9c58a573 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -1185,6 +1185,10 @@ static void proxy_cleanup(FsContext *ctx)
{
V9fsProxy *proxy = ctx->private;
+ if (!proxy) {
+ return;
+ }
+
g_free(proxy->out_iovec.iov_base);
g_free(proxy->in_iovec.iov_base);
if (ctx->export_flags & V9FS_PROXY_SOCK_NAME) {
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index cf317bdd2b92..ba1ab920f1eb 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3637,27 +3637,23 @@ int v9fs_device_realize_common(V9fsState *s, const
V9fsTransport *t,
s->ctx.fst = &fse->fst;
fsdev_throttle_init(s->ctx.fst);
- v9fs_path_free(&path);
-
rc = 0;
out:
if (rc) {
- if (s->ops && s->ops->cleanup && s->ctx.private) {
- s->ops->cleanup(&s->ctx);
- }
- g_free(s->tag);
- g_free(s->ctx.fs_root);
- v9fs_path_free(&path);
+ v9fs_device_unrealize_common(s, NULL);
}
+ v9fs_path_free(&path);
return rc;
}
void v9fs_device_unrealize_common(V9fsState *s, Error **errp)
{
- if (s->ops->cleanup) {
+ if (s->ops && s->ops->cleanup) {
s->ops->cleanup(&s->ctx);
}
- fsdev_throttle_cleanup(s->ctx.fst);
+ if (s->ctx.fst) {
+ fsdev_throttle_cleanup(s->ctx.fst);
+ }
g_free(s->tag);
g_free(s->ctx.fs_root);
}
--
2.21.0
- [PULL v2 0/8] 9p patches 2019-10-10, Greg Kurz, 2019/10/10
- [PULL v2 1/8] 9p: unsigned type for type, version, path, Greg Kurz, 2019/10/10
- [PULL v2 6/8] 9p: stat_to_qid: implement slow path, Greg Kurz, 2019/10/10
- [PULL v2 3/8] fsdev: Add return value to fsdev_throttle_parse_opts(), Greg Kurz, 2019/10/10
- [PULL v2 5/8] 9p: Added virtfs option 'multidevs=remap|forbid|warn', Greg Kurz, 2019/10/10
- [PULL v2 8/8] MAINTAINERS: Downgrade status of virtio-9p to "Odd Fixes", Greg Kurz, 2019/10/10
- [PULL v2 2/8] 9p: Simplify error path of v9fs_device_realize_common(),
Greg Kurz <=
- [PULL v2 4/8] 9p: Treat multiple devices on one export as an error, Greg Kurz, 2019/10/10
- [PULL v2 7/8] 9p: Use variable length suffixes for inode remapping, Greg Kurz, 2019/10/10
- Re: [PULL v2 0/8] 9p patches 2019-10-10, Peter Maydell, 2019/10/14