Commit dc709bd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Do not send Query All EAs SMB when mount option nouser_xattr
  [CIFS] endian errors in lanman protocol support
  [CIFS] Fix oops in cifs_close due to unitialized lock sem and list in
  [CIFS] Fix oops when negotiating lanman and no password specified
  [CIFS]
  [CIFS] Allow cifsd to suspend if connection is lost
  [CIFS] Make midState usage more consistent
  [CIFS] spinlock protect read of last srv response time in timeout path
  [CIFS] Do not time out posix brl requests when using new posix setfileinfo
parents d9629953 ea4c07d7

fs/cifs/CHANGES

+10 −0
Original line number Diff line number Diff line 
Version 1.45

------------

Do not time out lockw calls when using posix extensions. Do not

time out requests if server still responding reasonably fast

on requests on other threads.  Improve POSIX locking emulation,

(lock cancel now works, and unlock of merged range works even

to Windows servers now).  Fix oops on mount to lanman servers

(win9x, os/2 etc.) when null password.  Do not send listxattr

(SMB to query all EAs) if nouser_xattr specified.



Version 1.44

------------

Rewritten sessionsetup support, including support for legacy SMB

fs/cifs/README

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ A partial list of the supported mount options follows: 
  user_xattr    Allow getting and setting user xattrs as OS/2 EAs (extended

		attributes) to the server (default) e.g. via setfattr 

		and getfattr utilities. 

  nouser_xattr  Do not allow getfattr/setfattr to get/set xattrs 

  nouser_xattr  Do not allow getfattr/setfattr to get/set/list xattrs 

  mapchars      Translate six of the seven reserved characters (not backslash)

			*?<>|:

		to the remap range (above 0xF000), which also

fs/cifs/cifsencrypt.c

+2 −1
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ void calc_lanman_hash(struct cifsSesInfo * ses, char * lnm_session_key) 
		return;



	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);

	if(ses->password)

		strncpy(password_with_pad, ses->password, CIFS_ENCPWD_SIZE);



	if((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0)

fs/cifs/cifsfs.c

+1 −5
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ static struct quotactl_ops cifs_quotactl_ops = { 
};

#endif



#ifdef CONFIG_CIFS_EXPERIMENTAL

static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags)

{

	struct cifs_sb_info *cifs_sb;
@@ -422,7 +421,7 @@ static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags) 
		tcon->tidStatus = CifsExiting;

	up(&tcon->tconSem);



	/* cancel_brl_requests(tcon); */

	/* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */

	/* cancel_notify_requests(tcon); */

	if(tcon->ses && tcon->ses->server)

	{
@@ -438,7 +437,6 @@ static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags) 


	return;

}

#endif	



static int cifs_remount(struct super_block *sb, int *flags, char *data)

{
@@ -457,9 +455,7 @@ struct super_operations cifs_super_ops = { 
   unless later we add lazy close of inodes or unless the kernel forgets to call

   us with the same number of releases (closes) as opens */

	.show_options = cifs_show_options,

#ifdef CONFIG_CIFS_EXPERIMENTAL

	.umount_begin   = cifs_umount_begin,

#endif

	.remount_fs = cifs_remount,

};

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -100,5 +100,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); 
extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);

extern int cifs_ioctl (struct inode * inode, struct file * filep,

		       unsigned int command, unsigned long arg);

#define CIFS_VERSION   "1.44"

#define CIFS_VERSION   "1.45"

#endif				/* _CIFSFS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE