James Morris f3a5c54701 Merge branch 'master' into next ...

Conflicts:
	fs/cifs/misc.c

Merge to resolve above, per the patch below.

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/cifs/misc.c
index ec36410,addd1dc..0000000
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer
  		/*  BB Add support for establishing new tCon and SMB Session  */
  		/*      with userid/password pairs found on the smb session   */
  		/*	for other target tcp/ip addresses 		BB    */
 -				if (current->fsuid != treeCon->ses->linux_uid) {
 +				if (current_fsuid() != treeCon->ses->linux_uid) {
  					cFYI(1, ("Multiuser mode and UID "
  						 "did not match tcon uid"));
- 					read_lock(&GlobalSMBSeslock);
- 					list_for_each(temp_item, &GlobalSMBSessionList) {
- 						ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
+ 					read_lock(&cifs_tcp_ses_lock);
+ 					list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) {
+ 						ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list);
 -						if (ses->linux_uid == current->fsuid) {
 +						if (ses->linux_uid == current_fsuid()) {
  							if (ses->server == treeCon->ses->server) {
  								cFYI(1, ("found matching uid substitute right smb_uid"));
  								buffer->Uid = ses->Suid;

2008-11-18 18:52:37 +11:00

..

array.c

CRED: Use RCU to access another task's creds and to release a task's own creds

2008-11-14 10:39:19 +11:00

base.c

CRED: Use RCU to access another task's creds and to release a task's own creds

2008-11-14 10:39:19 +11:00

cmdline.c

proc: switch /proc/cmdline to seq_file

2008-10-23 14:29:04 +04:00

cpuinfo.c

proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c

2008-10-23 15:05:11 +04:00

devices.c

proc: move /proc/devices code to fs/proc/devices.c

2008-10-23 15:02:18 +04:00

generic.c

proc: use WARN() rather than printk+backtrace

2008-10-23 13:34:38 +04:00

inode-alloc.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

inode.c

proc: proc_init_inodecache() can't fail

2008-10-23 13:27:50 +04:00

internal.h

proc: move /proc/kmsg creation to fs/proc/kmsg.c

2008-10-23 14:35:08 +04:00

interrupts.c

proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c

2008-10-23 15:15:46 +04:00

Kconfig

proc: move PROC_PAGE_MONITOR to fs/proc/Kconfig

2008-10-10 04:18:57 +04:00

kcore.c

proc: move all /proc/kcore stuff to fs/proc/kcore.c

2008-10-23 18:32:38 +04:00

kmsg.c

proc: move /proc/kmsg creation to fs/proc/kmsg.c

2008-10-23 14:35:08 +04:00

loadavg.c

proc: switch /proc/loadavg to seq_file

2008-10-23 13:45:28 +04:00

Makefile

proc: remove fs/proc/proc_misc.c

2008-10-23 18:54:05 +04:00

meminfo.c

proc: switch /proc/meminfo to seq_file

2008-10-23 13:52:40 +04:00

mmu.c

fs/proc/mmu.c: headers butchery

2007-10-17 08:42:48 -07:00

nommu.c

/proc/self/maps doesn't display the real file offset

2008-08-20 15:40:30 -07:00

page.c

proc: move pagecount stuff to fs/proc/page.c

2008-10-23 18:48:31 +04:00

proc_devtree.c

proc: spread __init

2008-10-23 13:32:31 +04:00

proc_net.c

netns: make get_proc_net() static

2008-07-22 14:19:19 -07:00

proc_sysctl.c

Fix broken ownership of /proc/sys/ files

2008-11-16 15:09:52 -08:00

proc_tty.c

tty: Ldisc revamp

2008-07-20 17:12:34 -07:00

root.c

proc: remove fs/proc/proc_misc.c

2008-10-23 18:54:05 +04:00

stat.c

proc: move /proc/stat to fs/proc/stat.c

2008-10-23 15:14:05 +04:00

task_mmu.c

proc: fix vma display mismatch between /proc/pid/{maps,smaps}

2008-10-23 13:21:29 +04:00

task_nommu.c

proc: remove kernel.maps_protect

2008-10-10 04:24:51 +04:00

uptime.c

proc: revert /proc/uptime to ->read_proc hook

2008-10-27 22:56:56 +03:00

version.c

proc: switch /proc/version to seq_file

2008-10-23 14:19:58 +04:00

vmcore.c

proc: move /proc/vmcore creation to fs/proc/vmcore.c

2008-10-23 18:51:22 +04:00