1. 20 11月, 2008 2 次提交
  2. 18 11月, 2008 7 次提交
    • J
      Merge branch 'master' into next · f3a5c547
      James Morris 提交于
      Conflicts:
      	fs/cifs/misc.c
      
      Merge to resolve above, per the patch below.
      Signed-off-by: NJames 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;
      f3a5c547
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 4e14e833
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        prevent cifs_writepages() from skipping unwritten pages
        Fixed parsing of mount options when doing DFS submount
        [CIFS] Fix check for tcon seal setting and fix oops on failed mount from earlier patch
        [CIFS] Fix build break
        cifs: reinstate sharing of tree connections
        [CIFS] minor cleanup to cifs_mount
        cifs: reinstate sharing of SMB sessions sans races
        cifs: disable sharing session and tcon and add new TCP sharing code
        [CIFS] clean up server protocol handling
        [CIFS] remove unused list, add new cifs sock list to prepare for mount/umount fix
        [CIFS] Fix cifs reconnection flags
        [CIFS] Can't rely on iov length and base when kernel_recvmsg returns error
      4e14e833
    • D
      prevent cifs_writepages() from skipping unwritten pages · b066a48c
      Dave Kleikamp 提交于
      Fixes a data corruption under heavy stress in which pages could be left
      dirty after all open instances of a inode have been closed.
      
      In order to write contiguous pages whenever possible, cifs_writepages()
      asks pagevec_lookup_tag() for more pages than it may write at one time.
      Normally, it then resets index just past the last page written before calling
      pagevec_lookup_tag() again.
      
      If cifs_writepages() can't write the first page returned, it wasn't resetting
      index, and the next call to pagevec_lookup_tag() resulted in skipping all of
      the pages it previously returned, even though cifs_writepages() did nothing
      with them.  This can result in data loss when the file descriptor is about
      to be closed.
      
      This patch ensures that index gets set back to the next returned page so
      that none get skipped.
      Signed-off-by: NDave Kleikamp <shaggy@linux.vnet.ibm.com>
      Acked-by: NJeff Layton <jlayton@redhat.com>
      Cc: Shirish S Pargaonkar <shirishp@us.ibm.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      b066a48c
    • I
      Fixed parsing of mount options when doing DFS submount · 2c55608f
      Igor Mammedov 提交于
      Since these hit the same routines, and are relatively small, it is easier to review
      them as one patch.
      
      Fixed incorrect handling of the last option in some cases
      Fixed prefixpath handling convert path_consumed into host depended string length (in bytes)
      Use non default separator if it is provided in the original mount options
      Acked-by: NJeff Layton <jlayton@redhat.com>
      Signed-off-by: NIgor Mammedov <niallain@gmail.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      2c55608f
    • K
      Remove -mno-spe flags as they dont belong · 65ecc14a
      Kumar Gala 提交于
      For some unknown reason at Steven Rostedt added in disabling of the SPE
      instruction generation for e500 based PPC cores in commit
      6ec56232.
      
      We are removing it because:
      
      1. It generates e500 kernels that don't work
      2. its not the correct set of flags to do this
      3. we handle this in the arch/powerpc/Makefile already
      4. its unknown in talking to Steven why he did this
      Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
      Tested-and-Acked-by: NSteven Rostedt <srostedt@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      65ecc14a
    • L
      Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd · e77a20e8
      Linus Torvalds 提交于
      * 'for-linus' of git://git.o-hand.com/linux-mfd:
        mfd: Correct WM8350 I2C return code usage
        mfd: fix event masking for da9030
      e77a20e8
    • S
      [CIFS] Fix check for tcon seal setting and fix oops on failed mount from earlier patch · ab3f9929
      Steve French 提交于
      set tcon->ses earlier
      
      If the inital tree connect fails, we'll end up calling cifs_put_smb_ses
      with a NULL pointer. Fix it by setting the tcon->ses earlier.
      Acked-by: NJeff Layton <jlayton@redhat.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      ab3f9929
  3. 17 11月, 2008 15 次提交
  4. 16 11月, 2008 16 次提交