diff options
author | Randy.Dunlap <rdunlap@xenotime.net> | 2006-01-11 15:17:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:13 -0500 |
commit | c59ede7b78db329949d9cdcd7064e22d357560ef (patch) | |
tree | f9dc9d464fdad5bfd464d983e77c1af031389dda /fs/xfs/linux-2.6/xfs_cred.h | |
parent | e16885c5ad624a6efe1b1bf764e075d75f65a788 (diff) |
[PATCH] move capable() to capability.h
- Move capable() from sched.h to capability.h;
- Use <linux/capability.h> where capable() is used
(in include/, block/, ipc/, kernel/, a few drivers/,
mm/, security/, & sound/;
many more drivers/ to go)
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_cred.h')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_cred.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h index 4af491024727..e7f3da61c6c3 100644 --- a/fs/xfs/linux-2.6/xfs_cred.h +++ b/fs/xfs/linux-2.6/xfs_cred.h | |||
@@ -18,6 +18,8 @@ | |||
18 | #ifndef __XFS_CRED_H__ | 18 | #ifndef __XFS_CRED_H__ |
19 | #define __XFS_CRED_H__ | 19 | #define __XFS_CRED_H__ |
20 | 20 | ||
21 | #include <linux/capability.h> | ||
22 | |||
21 | /* | 23 | /* |
22 | * Credentials | 24 | * Credentials |
23 | */ | 25 | */ |
@@ -27,7 +29,7 @@ typedef struct cred { | |||
27 | 29 | ||
28 | extern struct cred *sys_cred; | 30 | extern struct cred *sys_cred; |
29 | 31 | ||
30 | /* this is a hack.. (assums sys_cred is the only cred_t in the system) */ | 32 | /* this is a hack.. (assumes sys_cred is the only cred_t in the system) */ |
31 | static __inline int capable_cred(cred_t *cr, int cid) | 33 | static __inline int capable_cred(cred_t *cr, int cid) |
32 | { | 34 | { |
33 | return (cr == sys_cred) ? 1 : capable(cid); | 35 | return (cr == sys_cred) ? 1 : capable(cid); |