diff options
author | Eric Paris <eparis@redhat.com> | 2011-04-01 17:08:39 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-03 20:31:12 -0400 |
commit | 5163b583a036b103c3cec7171d6731c125773ed6 (patch) | |
tree | c3ee80267d6d29f4302308414bcf2af41087f575 | |
parent | ffa8e59df047d57e812a04f7d6baf6a25c652c0c (diff) |
capabilities: delete unused cap_set_full
unused code. Clean it up.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Andrew G. Morgan <morgan@kernel.org>
Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | include/linux/capability.h | 2 | ||||
-rw-r--r-- | kernel/capability.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 11d562863e4..8d0da30dad2 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
@@ -425,7 +425,6 @@ extern const kernel_cap_t __cap_init_eff_set; | |||
425 | #define CAP_INIT_EFF_SET CAP_FULL_SET | 425 | #define CAP_INIT_EFF_SET CAP_FULL_SET |
426 | 426 | ||
427 | # define cap_clear(c) do { (c) = __cap_empty_set; } while (0) | 427 | # define cap_clear(c) do { (c) = __cap_empty_set; } while (0) |
428 | # define cap_set_full(c) do { (c) = __cap_full_set; } while (0) | ||
429 | 428 | ||
430 | #define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag)) | 429 | #define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag)) |
431 | #define cap_lower(c, flag) ((c).cap[CAP_TO_INDEX(flag)] &= ~CAP_TO_MASK(flag)) | 430 | #define cap_lower(c, flag) ((c).cap[CAP_TO_INDEX(flag)] &= ~CAP_TO_MASK(flag)) |
@@ -547,7 +546,6 @@ extern bool ns_capable(struct user_namespace *ns, int cap); | |||
547 | extern bool task_ns_capable(struct task_struct *t, int cap); | 546 | extern bool task_ns_capable(struct task_struct *t, int cap); |
548 | 547 | ||
549 | extern const kernel_cap_t __cap_empty_set; | 548 | extern const kernel_cap_t __cap_empty_set; |
550 | extern const kernel_cap_t __cap_full_set; | ||
551 | 549 | ||
552 | /** | 550 | /** |
553 | * nsown_capable - Check superior capability to one's own user_ns | 551 | * nsown_capable - Check superior capability to one's own user_ns |
diff --git a/kernel/capability.c b/kernel/capability.c index 2a374d512ea..14ea4210a53 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
@@ -22,10 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; | 24 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; |
25 | const kernel_cap_t __cap_full_set = CAP_FULL_SET; | ||
26 | 25 | ||
27 | EXPORT_SYMBOL(__cap_empty_set); | 26 | EXPORT_SYMBOL(__cap_empty_set); |
28 | EXPORT_SYMBOL(__cap_full_set); | ||
29 | 27 | ||
30 | int file_caps_enabled = 1; | 28 | int file_caps_enabled = 1; |
31 | 29 | ||