Patchwork hw/9pfs: Improve portability to older systems

login
register
mail settings
Submitter Aneesh Kumar K.V
Date Nov. 29, 2011, 9:41 a.m.
Message ID <1322559689-26605-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/128258/
State New
Headers show

Comments

Aneesh Kumar K.V - Nov. 29, 2011, 9:41 a.m.
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

commit ae0f940e6b4f5177892dd6a12762282fa9089972
2507718baf311ea78156c6777d38410a9f89ce89 missed updating
virtio-9p-handle.c.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 hw/9pfs/virtio-9p-handle.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 7644ae5..93552a1 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -599,7 +599,8 @@  static int handle_unlinkat(FsContext *ctx, V9fsPath *dir,
 static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path,
                                  mode_t st_mode, uint64_t *st_gen)
 {
-    int err;
+    int err = -ENOTTY;
+#ifdef FS_IOC_GETVERSION
     V9fsFidOpenState fid_open;
 
     /*
@@ -615,6 +616,7 @@  static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path,
     }
     err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen);
     handle_close(ctx, &fid_open);
+#endif
     return err;
 }
 
@@ -630,6 +632,7 @@  static int handle_init(FsContext *ctx)
         ret = data->mountfd;
         goto err_out;
     }
+#ifdef FS_IOC_GETVERSION
     ret = statfs(ctx->fs_root, &stbuf);
     if (!ret) {
         switch (stbuf.f_type) {
@@ -641,6 +644,7 @@  static int handle_init(FsContext *ctx)
             break;
         }
     }
+#endif
     memset(&fh, 0, sizeof(struct file_handle));
     ret = name_to_handle(data->mountfd, ".", &fh, &mnt_id, 0);
     if (ret && errno == EOVERFLOW) {