From: Mike Marshall <hubcap@omnibond.com>
Date: Thu, 17 Dec 2015 19:31:24 +0000 (-0500)
Subject: Orangefs: don't use deprecated xattr defines.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fef8b67ce6cab8e031285642b841acf5355d6788;p=linux-beck.git

Orangefs: don't use deprecated xattr defines.

Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---

diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index c337a52eb639..0b7ba0496aa3 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -173,17 +173,8 @@ struct client_debug_mask {
 #define ORANGEFS_XATTR_INDEX_TRUSTED           3
 #define ORANGEFS_XATTR_INDEX_DEFAULT           4
 
-#if 0
-#ifndef POSIX_ACL_XATTR_ACCESS
-#define POSIX_ACL_XATTR_ACCESS	"system.posix_acl_access"
-#endif
-#ifndef POSIX_ACL_XATTR_DEFAULT
-#define POSIX_ACL_XATTR_DEFAULT	"system.posix_acl_default"
-#endif
-#endif
-
-#define ORANGEFS_XATTR_NAME_ACL_ACCESS  POSIX_ACL_XATTR_ACCESS
-#define ORANGEFS_XATTR_NAME_ACL_DEFAULT POSIX_ACL_XATTR_DEFAULT
+#define ORANGEFS_XATTR_NAME_ACL_ACCESS XATTR_NAME_POSIX_ACL_ACCESS
+#define ORANGEFS_XATTR_NAME_ACL_DEFAULT XATTR_NAME_POSIX_ACL_DEFAULT
 #define ORANGEFS_XATTR_NAME_TRUSTED_PREFIX "trusted."
 #define ORANGEFS_XATTR_NAME_DEFAULT_PREFIX ""