From: Dennis Schafroth <dennis@schafroth.dk>
Date: Tue, 30 Jun 2015 17:55:10 +0000 (+0200)
Subject: common/xattr: Split out xattr on Linux and DARWIN.
X-Git-Tag: v9.1.0~259^2~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cfac6c3023f740c8fddb6b41d6c8a388917c980;p=ceph.git

common/xattr: Split out xattr on Linux and DARWIN.

DARWIN requires position parameter

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

diff --git a/src/common/xattr.c b/src/common/xattr.c
index 239ee02db42f..b2e522b88041 100644
--- a/src/common/xattr.c
+++ b/src/common/xattr.c
@@ -9,6 +9,7 @@
  * Foundation.  See file COPYING.
  */
 
+#include "acconfig.h"
 #if defined(__FreeBSD__)
 #include <errno.h>
 #include <stdint.h>
@@ -42,8 +43,10 @@ ceph_os_setxattr(const char *path, const char *name,
 	    size);
 	if (error > 0)
 		error = 0;
-#elif defined(__linux__) || defined(DARWIN)
+#elif defined(__linux__) 
 	error = setxattr(path, name, value, size, 0);
+#elif defined(DARWIN)
+	error = setxattr(path, name, value, size, 0 /* position */, 0);
 #endif
 
 	return (error);
@@ -56,12 +59,13 @@ ceph_os_fsetxattr(int fd, const char *name, const void *value,
 	int error = -1;
 
 #if defined(__FreeBSD__)
-	error = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, name, value,
-	    size);
+	error = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, name, value, size);
 	if (error > 0)
 		error = 0;
-#elif defined(__linux__) || defined(DARWIN)
+#elif defined(__linux__)
 	error = fsetxattr(fd, name, value, size, 0);
+#elif defined(DARWIN)
+	error = fsetxattr(fd, name, value, size, 0, 0 /* no options should be indentical to Linux */ );
 #endif
 
 	return (error);
@@ -93,7 +97,7 @@ void *value, size_t size)
 #elif defined(__linux__)
 	error = getxattr(path, name, value, size);
 #elif defined(DARWIN)
-	error = getxattr(path, name, value, size, 0);
+	error = getxattr(path, name, value, size, 0 /* position  */, 0);
 #endif
 
 	return (error);
@@ -125,7 +129,7 @@ ceph_os_fgetxattr(int fd, const char *name, void *value,
 #elif defined(__linux__)
 	error = fgetxattr(fd, name, value, size);
 #elif defined(DARWIN)
-	error = fgetxattr(fd, name, value, size, 0);
+	error = fgetxattr(fd, name, value, size, 0, 0 /* no options */);
 #endif
 
 	return (error);