[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] 9p: local: Avoid warning if FS_IOC_GETVERSION is
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 5/7] 9p: local: Avoid warning if FS_IOC_GETVERSION is not defined |
Date: |
Thu, 7 Jun 2018 17:21:17 +0200 |
From: Keno Fischer <address@hidden>
Both `stbuf` and `local_ioc_getversion` where unused when
FS_IOC_GETVERSION was not defined, causing a compiler warning.
Reorganize the code to avoid this warning.
Signed-off-by: Keno Fischer <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
---
hw/9pfs/9p-local.c | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 7758c3850900..5721eff1e189 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1373,10 +1373,10 @@ static int local_unlinkat(FsContext *ctx, V9fsPath *dir,
return ret;
}
+#ifdef FS_IOC_GETVERSION
static int local_ioc_getversion(FsContext *ctx, V9fsPath *path,
mode_t st_mode, uint64_t *st_gen)
{
-#ifdef FS_IOC_GETVERSION
int err;
V9fsFidOpenState fid_open;
@@ -1395,32 +1395,21 @@ static int local_ioc_getversion(FsContext *ctx,
V9fsPath *path,
err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen);
local_close(ctx, &fid_open);
return err;
-#else
- errno = ENOTTY;
- return -1;
-#endif
}
+#endif
-static int local_init(FsContext *ctx, Error **errp)
+static int local_ioc_getversion_init(FsContext *ctx, LocalData *data, Error
**errp)
{
+#ifdef FS_IOC_GETVERSION
struct statfs stbuf;
- LocalData *data = g_malloc(sizeof(*data));
- data->mountfd = open(ctx->fs_root, O_DIRECTORY | O_RDONLY);
- if (data->mountfd == -1) {
- error_setg_errno(errp, errno, "failed to open '%s'", ctx->fs_root);
- goto err;
- }
-
-#ifdef FS_IOC_GETVERSION
/*
* use ioc_getversion only if the ioctl is definied
*/
if (fstatfs(data->mountfd, &stbuf) < 0) {
- close_preserve_errno(data->mountfd);
error_setg_errno(errp, errno,
- "failed to stat file system at '%s'", ctx->fs_root);
- goto err;
+ "failed to stat file system at '%s'", ctx->fs_root);
+ return -1;
}
switch (stbuf.f_type) {
case EXT2_SUPER_MAGIC:
@@ -1431,6 +1420,23 @@ static int local_init(FsContext *ctx, Error **errp)
break;
}
#endif
+ return 0;
+}
+
+static int local_init(FsContext *ctx, Error **errp)
+{
+ LocalData *data = g_malloc(sizeof(*data));
+
+ data->mountfd = open(ctx->fs_root, O_DIRECTORY | O_RDONLY);
+ if (data->mountfd == -1) {
+ error_setg_errno(errp, errno, "failed to open '%s'", ctx->fs_root);
+ goto err;
+ }
+
+ if (local_ioc_getversion_init(ctx, data, errp) < 0) {
+ close(data->mountfd);
+ goto err;
+ }
if (ctx->export_flags & V9FS_SM_PASSTHROUGH) {
ctx->xops = passthrough_xattr_ops;
--
2.14.4
- [Qemu-devel] [PULL 0/7] 9p patches 2018-06-07, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 4/7] 9p: xattr: Fix crashes due to free of uninitialized value, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 5/7] 9p: local: Avoid warning if FS_IOC_GETVERSION is not defined,
Greg Kurz <=
- [Qemu-devel] [PULL 6/7] 9p: Properly check/translate flags in unlinkat, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 2/7] 9p: local: Properly set errp in fstatfs error path, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 1/7] 9p: proxy: Fix size passed to `connect`, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 3/7] 9p: Move a couple xattr functions to 9p-util, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 7/7] 9p: xattr: Properly translate xattrcreate flags, Greg Kurz, 2018/06/07
- Re: [Qemu-devel] [PULL 0/7] 9p patches 2018-06-07, Peter Maydell, 2018/06/08