Merge branch 'master' into next
James Morris [Tue, 18 Nov 2008 07:52:37 +0000 (18:52 +1100)]
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;

1  2 
Documentation/kernel-parameters.txt
fs/cifs/connect.c
fs/cifs/misc.c
kernel/Makefile
kernel/exit.c
kernel/fork.c
net/core/scm.c

Simple merge
Simple merge
diff --cc 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;
diff --cc kernel/Makefile
@@@ -9,10 -9,8 +9,8 @@@ obj-y     = sched.o fork.o exec_domain.
            rcupdate.o extable.o params.o posix-timers.o \
            kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
            hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 -          notifier.o ksysfs.o pm_qos_params.o sched_clock.o
 +          notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o
  
- CFLAGS_REMOVE_sched.o = -mno-spe
  ifdef CONFIG_FUNCTION_TRACER
  # Do not trace debug files and internal ftrace files
  CFLAGS_REMOVE_lockdep.o = -pg
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc net/core/scm.c
Simple merge