diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /security/smack/smack.h | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index a21a0e907ab3..62c1e982849d 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h | |||
| @@ -26,14 +26,6 @@ | |||
| 26 | #define SMK_MAXLEN 23 | 26 | #define SMK_MAXLEN 23 |
| 27 | #define SMK_LABELLEN (SMK_MAXLEN+1) | 27 | #define SMK_LABELLEN (SMK_MAXLEN+1) |
| 28 | 28 | ||
| 29 | /* | ||
| 30 | * How many kinds of access are there? | ||
| 31 | * Here's your answer. | ||
| 32 | */ | ||
| 33 | #define SMK_ACCESSDASH '-' | ||
| 34 | #define SMK_ACCESSLOW "rwxa" | ||
| 35 | #define SMK_ACCESSKINDS (sizeof(SMK_ACCESSLOW) - 1) | ||
| 36 | |||
| 37 | struct superblock_smack { | 29 | struct superblock_smack { |
| 38 | char *smk_root; | 30 | char *smk_root; |
| 39 | char *smk_floor; | 31 | char *smk_floor; |