[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/20] 9p: Avoid warning if FS_IOC_GETVERSION is
From: |
Keno Fischer |
Subject: |
[Qemu-devel] [PATCH v2 06/20] 9p: Avoid warning if FS_IOC_GETVERSION is not defined |
Date: |
Thu, 31 May 2018 21:26:01 -0400 |
Both `stbuf` and `local_ioc_getversion` where unused when
FS_IOC_GETVERSION was not defined, causing a compiler warning.
Reorgnaize the code to avoid this warning.
Signed-off-by: Keno Fischer <address@hidden>
---
Changes since v1:
* As request in review, logic is factored into a
local_ioc_getversion_init function.
hw/9pfs/9p-local.c | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 576c8e3..6222891 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1375,10 +1375,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;
@@ -1397,32 +1397,19 @@ 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)
{
+#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;
+ return -1;
}
switch (stbuf.f_type) {
case EXT2_SUPER_MAGIC:
@@ -1433,6 +1420,26 @@ 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) < 0) {
+ close_preserve_errno(data->mountfd);
+ error_setg_errno(errp, errno,
+ "failed initialize ioc_getversion for file system at '%s'",
+ ctx->fs_root);
+ goto err;
+ }
if (ctx->export_flags & V9FS_SM_PASSTHROUGH) {
ctx->xops = passthrough_xattr_ops;
--
2.8.1
- [Qemu-devel] [PATCH v2 00/20] 9p: Add support for Darwin, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 01/20] cutils: Provide strchrnul, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 02/20] 9p: proxy: Fix size passed to `connect`, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 06/20] 9p: Avoid warning if FS_IOC_GETVERSION is not defined,
Keno Fischer <=
- [Qemu-devel] [PATCH v2 03/20] 9p: xattr: Fix crash due to free of uninitialized value, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 05/20] 9p: Properly set errp in fstatfs error path, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 04/20] 9p: linux: Fix a couple Linux assumptions, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 07/20] 9p: Move a couple xattr functions to 9p-util, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 11/20] 9p: darwin: Handle struct dirent differences, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 08/20] 9p: Rename 9p-util -> 9p-util-linux, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 09/20] 9p: Properly check/translate flags in unlinkat, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 10/20] 9p: darwin: Handle struct stat(fs) differences, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 12/20] 9p: darwin: Explicitly cast comparisons of mode_t with -1, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 14/20] 9p: darwin: Provide a compatibility definition for XATTR_SIZE_MAX, Keno Fischer, 2018/05/31