From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 28 Jan 2013 15:33:43 +0000 (+0100)
Subject: rbd-fuse: fix usage of conn->want
X-Git-Tag: v0.57~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21673e8b9e4e949706874c3a89771f15bbf5aeca;p=ceph.git

rbd-fuse: fix usage of conn->want

Fix usage of conn->want and FUSE_CAP_BIG_WRITES. Both need libfuse
version >= 2.8. Encapsulate the related code line into a check for
the needed FUSE_VERSION as already done in ceph-fuse in some cases.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rbd_fuse/rbd-fuse.c b/src/rbd_fuse/rbd-fuse.c
index b3e318f0781..c204463b878 100644
--- a/src/rbd_fuse/rbd-fuse.c
+++ b/src/rbd_fuse/rbd-fuse.c
@@ -461,8 +461,9 @@ rbdfs_init(struct fuse_conn_info *conn)
 	ret = rados_ioctx_create(cluster, pool_name, &ioctx);
 	if (ret < 0)
 		exit(91);
-
+#if FUSE_VERSION >= FUSE_MAKE_VERSION(2, 8)
 	conn->want |= FUSE_CAP_BIG_WRITES;
+#endif
 	gotrados = 1;
 
 	// init's return value shows up in fuse_context.private_data,