diff options
author | Nick Black <dank@qemfd.net> | 2009-09-22 19:43:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:28 -0400 |
commit | 1fd7317d02ec03c6fdf072317841287933d06d24 (patch) | |
tree | b7ac4d511896dbb21c1b76a27f6c4d5b4cb6c7bb /security/smack | |
parent | af91322ef3f29ae4114e736e2a72e28b4d619cf9 (diff) |
Move magic numbers into magic.h
Move various magic-number definitions into magic.h.
Signed-off-by: Nick Black <dank@qemfd.net>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/smack')
-rw-r--r-- | security/smack/smack_lsm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index acae7ef4092d..c33b6bb9b6dd 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -30,17 +30,11 @@ | |||
30 | #include <net/netlabel.h> | 30 | #include <net/netlabel.h> |
31 | #include <net/cipso_ipv4.h> | 31 | #include <net/cipso_ipv4.h> |
32 | #include <linux/audit.h> | 32 | #include <linux/audit.h> |
33 | #include <linux/magic.h> | ||
33 | #include "smack.h" | 34 | #include "smack.h" |
34 | 35 | ||
35 | #define task_security(task) (task_cred_xxx((task), security)) | 36 | #define task_security(task) (task_cred_xxx((task), security)) |
36 | 37 | ||
37 | /* | ||
38 | * I hope these are the hokeyist lines of code in the module. Casey. | ||
39 | */ | ||
40 | #define DEVPTS_SUPER_MAGIC 0x1cd1 | ||
41 | #define SOCKFS_MAGIC 0x534F434B | ||
42 | #define TMPFS_MAGIC 0x01021994 | ||
43 | |||
44 | /** | 38 | /** |
45 | * smk_fetch - Fetch the smack label from a file. | 39 | * smk_fetch - Fetch the smack label from a file. |
46 | * @ip: a pointer to the inode | 40 | * @ip: a pointer to the inode |