aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/misc.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-11-13 18:38:47 -0500
committerJames Morris <jmorris@namei.org>2008-11-13 18:38:47 -0500
commita001e5b558f25eb1e588522d73ac949b643b7a37 (patch)
tree96370a4535bd0d7b3e9908f04b58a8b3e94ed908 /fs/cifs/misc.c
parent1109b07b7dcb938de7a0d65efc1b4739dc4e9787 (diff)
CRED: Wrap task credential accesses in the CIFS 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> Cc: Steve French <sfrench@samba.org> Cc: linux-cifs-client@lists.samba.org Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/cifs/misc.c')
-rw-r--r--fs/cifs/misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 88786ba02d27..ec36410a9125 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -347,13 +347,13 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
347 /* BB Add support for establishing new tCon and SMB Session */ 347 /* BB Add support for establishing new tCon and SMB Session */
348 /* with userid/password pairs found on the smb session */ 348 /* with userid/password pairs found on the smb session */
349 /* for other target tcp/ip addresses BB */ 349 /* for other target tcp/ip addresses BB */
350 if (current->fsuid != treeCon->ses->linux_uid) { 350 if (current_fsuid() != treeCon->ses->linux_uid) {
351 cFYI(1, ("Multiuser mode and UID " 351 cFYI(1, ("Multiuser mode and UID "
352 "did not match tcon uid")); 352 "did not match tcon uid"));
353 read_lock(&GlobalSMBSeslock); 353 read_lock(&GlobalSMBSeslock);
354 list_for_each(temp_item, &GlobalSMBSessionList) { 354 list_for_each(temp_item, &GlobalSMBSessionList) {
355 ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList); 355 ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
356 if (ses->linux_uid == current->fsuid) { 356 if (ses->linux_uid == current_fsuid()) {
357 if (ses->server == treeCon->ses->server) { 357 if (ses->server == treeCon->ses->server) {
358 cFYI(1, ("found matching uid substitute right smb_uid")); 358 cFYI(1, ("found matching uid substitute right smb_uid"));
359 buffer->Uid = ses->Suid; 359 buffer->Uid = ses->Suid;