diff options
| author | James Morris <jmorris@namei.org> | 2011-05-19 12:51:57 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-19 12:51:57 +0400 |
| commit | 12a5a2621b1ee14d32beca35304d7c6076a58815 (patch) | |
| tree | 213e13f99de690b3c4a510f504393b63ada626bd /include/linux/capability.h | |
| parent | e77dc3460fa59be5759e9327ad882868eee9d61b (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
| download | linux-12a5a2621b1ee14d32beca35304d7c6076a58815.tar.xz | |
Merge branch 'master' into next
Conflicts:
include/linux/capability.h
Manually resolve merge conflict w/ thanks to Stephen Rothwell.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/capability.h')
| -rw-r--r-- | include/linux/capability.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 04fed72809de..cb15818310f4 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -541,20 +541,7 @@ extern bool has_capability_noaudit(struct task_struct *t, int cap); extern bool capable(int cap); 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; - -/** - * nsown_capable - Check superior capability to one's own user_ns - * @cap: The capability in question - * - * Return true if the current task has the given superior capability - * targeted at its own user namespace. - */ -static inline bool nsown_capable(int cap) -{ - return ns_capable(current_user_ns(), cap); -} +extern bool nsown_capable(int cap); /* audit system wants to get cap info from files as well */ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); |