aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-10-31 00:50:04 -0400
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-10-31 00:50:04 -0400
commit91b777125175077fb74025608dba87f100586c62 (patch)
treefb675ce7ba064ae01ff8892d88ef965ebacea1be /fs/xfs/linux-2.6
parent6bfb3d065f4c498c17a3a07f3dc08cedff53aff4 (diff)
CRED: Wrap task credential accesses in the XFS filesystem
Wrap access to task credentials so that they can be separated more easily from the task_struct during the introduction of COW creds. Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id(). Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more sense to use RCU directly rather than a convenient wrapper; these will be addressed by later patches. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: James Morris <jmorris@namei.org> Acked-by: Serge Hallyn <serue@us.ibm.com>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r--fs/xfs/linux-2.6/xfs_cred.h2
-rw-r--r--fs/xfs/linux-2.6/xfs_ioctl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h
index 98da2199bc23..e279d00779f4 100644
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
@@ -24,7 +24,7 @@
24 * Credentials 24 * Credentials
25 */ 25 */
26typedef struct cred { 26typedef struct cred {
27 /* EMPTY */ 27 /* EMPTY */
28} cred_t; 28} cred_t;
29 29
30#endif /* __XFS_CRED_H__ */ 30#endif /* __XFS_CRED_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index d25694e8cd62..f1bd6c36e6fe 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -1006,7 +1006,7 @@ xfs_ioctl_setattr(
1006 * to the file owner ID, except in cases where the 1006 * to the file owner ID, except in cases where the
1007 * CAP_FSETID capability is applicable. 1007 * CAP_FSETID capability is applicable.
1008 */ 1008 */
1009 if (current->fsuid != ip->i_d.di_uid && !capable(CAP_FOWNER)) { 1009 if (current_fsuid() != ip->i_d.di_uid && !capable(CAP_FOWNER)) {
1010 code = XFS_ERROR(EPERM); 1010 code = XFS_ERROR(EPERM);
1011 goto error_return; 1011 goto error_return;
1012 } 1012 }