[PATCH] Move XATTR_SECURITY_PREFIX macro to common location

From: Chris Wright <chrisw@osdl.org>

Move the XATTR_SECURITY_PREFIX macro to the xattr.h header so that it's in a
common location.

(Acked by Stephen Smalley)

diff --git a/fs/devpts/xattr_security.c b/fs/devpts/xattr_security.c
index b7c9b7cac1b0d068413682dac967dc90b3274a81..4291d7b35f20c3d4cde764ae99514127ebce00dc 100644 (file)
--- a/fs/devpts/xattr_security.c
+++ b/fs/devpts/xattr_security.c
@@ -8,8 +8,6 @@
 #include <linux/security.h>
 #include "xattr.h"
 
-#define XATTR_SECURITY_PREFIX "security."
-
 static size_t
 devpts_xattr_security_list(struct dentry *dentry, char *buffer)
 {

diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index 65a97edcefce4b7edd01811e9fa6cde8c3029b5c..837abd7bd1ca92992be524ab6856484d86cd0ead 100644 (file)
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -10,8 +10,6 @@
 #include <linux/ext2_fs.h>
 #include "xattr.h"
 
-#define XATTR_SECURITY_PREFIX "security."
-
 static size_t
 ext2_xattr_security_list(char *list, struct inode *inode,
                        const char *name, int name_len)

diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index f7488fc634005c062051db9c99b5790122c0c1d7..c948effaa25741fa103fbf7cb83268fbeecb201e 100644 (file)
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -11,8 +11,6 @@
 #include <linux/ext3_fs.h>
 #include "xattr.h"
 
-#define XATTR_SECURITY_PREFIX "security."
-
 static size_t
 ext3_xattr_security_list(char *list, struct inode *inode,
                    const char *name, int name_len)

diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 9e967b58ee2ea111a4aaecc42532a6e33f7c3f40..d9c5d5c83d4990e63698a688b3db4db67c52d721 100644 (file)
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -12,4 +12,6 @@
 #define XATTR_CREATE   0x1     /* set value, fail if attr already exists */
 #define XATTR_REPLACE  0x2     /* set value, fail if attr does not exist */
 
+#define XATTR_SECURITY_PREFIX  "security."
+
 #endif /* _LINUX_XATTR_H */

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 27b80131617be141bbca3bec42afb12a5b90fb30..cf1a9eca6629d5f582705809cc19f8b5a81e4548 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -16,10 +16,6 @@
  *      as published by the Free Software Foundation.
  */
 
-#define XATTR_SECURITY_PREFIX "security."
-#define XATTR_SELINUX_SUFFIX "selinux"
-#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -65,6 +61,9 @@
 #include "objsec.h"
 #include "netif.h"
 
+#define XATTR_SELINUX_SUFFIX "selinux"
+#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
+
 #ifdef CONFIG_SECURITY_SELINUX_DEVELOP
 int selinux_enforcing = 0;