OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f3a5c54701
linux/arch/s390/kernel
History
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
..
asm-offsets.c s390: use kbuild.h instead of defining macros in asm-offsets.c 2008-04-29 08:06:30 -07:00
audit.c
audit.h
base.S
bitmap.S
compat_audit.c
compat_exec_domain.c
compat_linux.c CRED: Separate task security context from task_struct 2008-11-14 10:39:16 +11:00
compat_linux.h compat: generic compat get/settimeofday 2008-10-16 11:21:33 -07:00
compat_ptrace.h [S390] CVE-2008-1514: prevent ptrace padding area read/write in 31-bit mode 2008-09-09 12:39:06 +02:00
compat_signal.c
compat_wrapper.S compat: generic compat get/settimeofday 2008-10-16 11:21:33 -07:00
cpcmd.c
crash.c
debug.c [S390] Cleanup s390 debug feature print messages. 2008-07-14 10:02:22 +02:00
diag.c
dis.c [S390] disassembler: fix idte instruction format. 2008-05-30 10:03:36 +02:00
early.c [S390] Remove P390 support. 2008-07-14 10:02:25 +02:00
ebcdic.c
entry64.S [S390] ftrace: fix kernel stack backchain walking 2008-11-14 18:18:53 +01:00
entry.h
entry.S [S390] ftrace: fix kernel stack backchain walking 2008-11-14 18:18:53 +01:00
head31.S [S390] Convert machine feature detection code to C. 2008-04-30 13:38:47 +02:00
head64.S [S390] System z large page support. 2008-04-30 13:38:47 +02:00
head.S
init_task.c [PATCH] take init_files to fs/file.c 2008-05-16 17:22:20 -04:00
ipl.c [S390] ipl: Reboot from alternate device does not work when booting from file 2008-08-01 16:39:30 +02:00
irq.c [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map. 2008-05-15 16:52:41 +02:00
kprobes.c stop_machine: Wean existing callers off stop_machine_run() 2008-07-28 12:16:31 +10:00
machine_kexec.c [S390] Cleanup kprobes printk messages. 2008-07-14 10:02:24 +02:00
Makefile [S390] Move memory detection code to own file. 2008-07-14 10:02:17 +02:00
mem_detect.c [S390] Remove diag 0x260 call from memory detection. 2008-08-01 16:39:34 +02:00
module.c
process.c [S390] ftrace: disable tracing on idle psw 2008-11-14 18:18:53 +01:00
ptrace.c [S390] ptrace changes 2008-10-10 21:33:57 +02:00
reipl64.S
reipl.S
relocate_kernel64.S
relocate_kernel.S
s390_ext.c
s390_ksyms.c
setup.c [S390] Fix range for add_active_range() in setup_memory() 2008-11-14 18:18:51 +01:00
signal.c [S390] ptrace changes 2008-10-10 21:33:57 +02:00
smp.c [S390] Fix sysdev class file creation. 2008-10-28 11:12:03 +01:00
stacktrace.c [S390] Fix stacktrace compile bug. 2008-07-17 17:22:09 +02:00
sys_s390.c [S390] fix s390x_newuname 2008-11-14 18:18:55 +01:00
syscalls.S compat: generic compat get/settimeofday 2008-10-16 11:21:33 -07:00
time.c [S390] fix initialization of stp 2008-10-10 21:34:02 +02:00
topology.c [S390] cpu topology: fix locking 2008-11-14 18:18:54 +01:00
traps.c [S390] Move show_regs to traps.c. 2008-04-30 13:38:43 +02:00
vmlinux.lds.S [S390] Fix linker script. 2008-08-25 18:15:01 +02:00
vtime.c [S390] Cleanup vtime printk messages. 2008-07-14 10:02:18 +02:00