diff options
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_cred.h | 4 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 1 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 1 |
3 files changed, 5 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); |
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index b3b2cfda273c..4db47790415c 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include "xfs_dfrag.h" | 52 | #include "xfs_dfrag.h" |
53 | #include "xfs_fsops.h" | 53 | #include "xfs_fsops.h" |
54 | 54 | ||
55 | #include <linux/capability.h> | ||
55 | #include <linux/dcache.h> | 56 | #include <linux/dcache.h> |
56 | #include <linux/mount.h> | 57 | #include <linux/mount.h> |
57 | #include <linux/namei.h> | 58 | #include <linux/namei.h> |
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 129403958044..4bd3d03b23ed 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include "xfs_buf_item.h" | 51 | #include "xfs_buf_item.h" |
52 | #include "xfs_utils.h" | 52 | #include "xfs_utils.h" |
53 | 53 | ||
54 | #include <linux/capability.h> | ||
54 | #include <linux/xattr.h> | 55 | #include <linux/xattr.h> |
55 | #include <linux/namei.h> | 56 | #include <linux/namei.h> |
56 | #include <linux/security.h> | 57 | #include <linux/security.h> |