aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2011-04-01 17:08:39 -0400
committerJames Morris <jmorris@namei.org>2011-04-04 10:31:12 +1000
commit5163b583a036b103c3cec7171d6731c125773ed6 (patch)
treec3ee80267d6d29f4302308414bcf2af41087f575
parentffa8e59df047d57e812a04f7d6baf6a25c652c0c (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.h2
-rw-r--r--kernel/capability.c2
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;
#define CAP_INIT_EFF_SET CAP_FULL_SET
# define cap_clear(c) do { (c) = __cap_empty_set; } while (0)
-# define cap_set_full(c) do { (c) = __cap_full_set; } while (0)
#define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))
#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);
extern bool task_ns_capable(struct task_struct *t, int cap);
extern const kernel_cap_t __cap_empty_set;
-extern const kernel_cap_t __cap_full_set;
/**
* 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 @@
*/
const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET;
-const kernel_cap_t __cap_full_set = CAP_FULL_SET;
EXPORT_SYMBOL(__cap_empty_set);
-EXPORT_SYMBOL(__cap_full_set);
int file_caps_enabled = 1;