From: Dennis Schafroth <dennis@schafroth.dk>
Date: Tue, 30 Jun 2015 18:12:37 +0000 (+0200)
Subject: rbd-fuse: Add position to set/get xattr on DARWIN
X-Git-Tag: v9.1.0~259^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3b29c0db0018907af7eea64aa2d984e1d703505;p=ceph.git

rbd-fuse: Add position to set/get xattr on DARWIN

Signed-off-by: Dennis Schafroth <dennis@schafroth.com>
---

diff --git a/src/rbd_fuse/rbd-fuse.cc b/src/rbd_fuse/rbd-fuse.cc
index 8da91e3fda46..4602cbfab971 100644
--- a/src/rbd_fuse/rbd-fuse.cc
+++ b/src/rbd_fuse/rbd-fuse.cc
@@ -11,7 +11,12 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#if defined(DARWIN) 
+#include <fuse/fuse.h>
+#include "porting.h"
+#else
 #include <fuse.h>
+#endif
 #include <pthread.h>
 #include <string.h>
 #include <sys/types.h>
@@ -597,7 +602,12 @@ struct rbdfuse_attr {
 
 int
 rbdfs_setxattr(const char *path, const char *name, const char *value,
-		 size_t size, int flags)
+	       size_t size,
+	       int flags
+#if defined(DARWIN)
+	       ,uint32_t pos
+#endif
+    )
 {
 	struct rbdfuse_attr *ap;
 	if (strcmp(path, "/") != 0)
@@ -616,7 +626,11 @@ rbdfs_setxattr(const char *path, const char *name, const char *value,
 
 int
 rbdfs_getxattr(const char *path, const char *name, char *value,
-		 size_t size)
+		 size_t size
+#if defined(DARWIN)
+	       ,uint32_t position
+#endif
+  )
 {
 	struct rbdfuse_attr *ap;
 	char buf[128];