From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 12 Jun 2013 01:33:08 +0000 (-0700)
Subject: ceph-fuse: older libfuses don't support FUSE_IOCTL_COMPAT
X-Git-Tag: v0.64~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68b5fa9b615bfd7da8a2f69a35c9cf1fd30b3c95;p=ceph.git

ceph-fuse: older libfuses don't support FUSE_IOCTL_COMPAT

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index 46480e61974d..83395534d0dc 100644
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -369,6 +369,7 @@ static void fuse_ll_flush(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info
   fuse_reply_err(req, 0);
 }
 
+#ifdef FUSE_IOCTL_COMPAT
 static void fuse_ll_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg, struct fuse_file_info *fi,
                           unsigned flags, const void *in_buf, size_t in_bufsz, size_t out_bufsz)
 {
@@ -396,6 +397,7 @@ static void fuse_ll_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg, st
       fuse_reply_err(req, EINVAL);
   }
 }
+#endif
 
 static void fuse_ll_release(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
 {
@@ -597,7 +599,9 @@ const static struct fuse_lowlevel_ops fuse_ll_oper = {
  getlk: 0,
  setlk: 0,
  bmap: 0,
- ioctl: fuse_ll_ioctl
+#ifdef FUSE_IOCTL_COMPAT
+ ioctl: fuse_ll_ioctl,
+#endif
 };