diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-28 22:09:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-28 22:09:33 +0300 |
| commit | 78fb88eca684ed6f09f01a232c925b6da75d8131 (patch) | |
| tree | c08af208456f79b57ff3c00762169db97526134e /include | |
| parent | a2d4f473df1117e437fee125fa7e9420e19207ec (diff) | |
| parent | 4ae89b1fe7c2e37a8f2ea39765e4c40c9d42a101 (diff) | |
| download | linux-78fb88eca684ed6f09f01a232c925b6da75d8131.tar.xz | |
Merge tag 'caps-pr-20250327' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux
Pull capabilities update from Serge Hallyn:
"This contains just one patch that removes a helper function whose last
user (smack) stopped using it in 2018"
* tag 'caps-pr-20250327' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux:
capability: Remove unused has_capability
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/capability.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 0c356a517991..1fb08922552c 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -139,7 +139,6 @@ static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a, } #ifdef CONFIG_MULTIUSER -extern bool has_capability(struct task_struct *t, int cap); extern bool has_ns_capability(struct task_struct *t, struct user_namespace *ns, int cap); extern bool has_capability_noaudit(struct task_struct *t, int cap); @@ -150,10 +149,6 @@ extern bool ns_capable(struct user_namespace *ns, int cap); extern bool ns_capable_noaudit(struct user_namespace *ns, int cap); extern bool ns_capable_setid(struct user_namespace *ns, int cap); #else -static inline bool has_capability(struct task_struct *t, int cap) -{ - return true; -} static inline bool has_ns_capability(struct task_struct *t, struct user_namespace *ns, int cap) { |