Commit 5cf11daf 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: (21 commits)
  [CIFS] Remove debug statement
  Fix possible access to undefined memory region.
  [CIFS] Enable DFS support for Windows query path info
  [CIFS] Enable DFS support for Unix query path info
  [CIFS] add missing seq_printf to cifs_show_options for hard mount option
  [CIFS] add more complete mount options to cifs_show_options
  [CIFS] Add missing defines for DFS
  CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec.
  Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now.
  [CIFS] enable parsing for transport encryption mount parm
  [CIFS] Finishup DFS code
  [CIFS] BKL-removal: convert CIFS over to unlocked_ioctl
  [CIFS] suppress duplicate warning
  [CIFS] Fix paths when share is in DFS to include proper prefix
  add function to convert access flags to legacy open mode
  clarify return value of cifs_convert_flags()
  [CIFS] don't explicitly do a FindClose on rewind when directory search has ended
  [CIFS] cleanup old checkpatch warnings
  [CIFS] CIFSSMBPosixLock should return -EINVAL on error
  fix memory leak in CIFSFindNext
  ...
parents d40ace0c 397d71dd

fs/cifs/AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Miklos Szeredi 
Kazeon team for various fixes especially for 2.4 version.

Asser Ferno (Change Notify support)

Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup

Igor Mammedov (DFS support)



Test case and Bug Report contributors

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

fs/cifs/CHANGES

+4 −1
Original line number Diff line number Diff line 
Version 1.53

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

DFS support added (Microsoft Distributed File System client support needed

for referrals which enable a hierarchical name space among servers).



Version 1.52

------------
@@ -12,7 +14,8 @@ Add ability to modify cifs acls for handling chmod (when mounted with 
cifsacl flag). Fix prefixpath path separator so we can handle mounts

with prefixpaths longer than one directory (one path component) when

mounted to Windows servers.  Fix slow file open when cifsacl

enabled.

enabled. Fix memory leak in FindNext when the SMB call returns -EBADF.





Version 1.51

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

fs/cifs/README

+5 −0
Original line number Diff line number Diff line
@@ -483,6 +483,11 @@ A partial list of the supported mount options follows: 
 sign           Must use packet signing (helps avoid unwanted data modification

		by intermediate systems in the route).  Note that signing

		does not work with lanman or plaintext authentication.

 seal           Must seal (encrypt) all data on this mounted share before

		sending on the network.  Requires support for Unix Extensions.

		Note that this differs from the sign mount option in that it

		causes encryption of data sent over this mounted share but other

		shares mounted to the same server are unaffected.

 sec            Security mode.  Allowed values are:

			none	attempt to connection as a null user (no name)

			krb5    Use Kerberos version 5 authentication

fs/cifs/TODO

+8 −7
Original line number Diff line number Diff line 
Version 1.52 January 3, 2008

Version 1.53 May 20, 2008



A Partial List of Missing Features

==================================
@@ -20,20 +20,21 @@ d) Cleanup now unneeded SessSetup code in 
fs/cifs/connect.c and add back in NTLMSSP code if any servers

need it



e) ms-dfs and ms-dfs host name resolution cleanup



f) fix NTLMv2 signing when two mounts with different users to same

e) fix NTLMv2 signing when two mounts with different users to same

server.



g) Directory entry caching relies on a 1 second timer, rather than 

f) Directory entry caching relies on a 1 second timer, rather than 

using FindNotify or equivalent.  - (started)



h) quota support (needs minor kernel change since quota calls

g) quota support (needs minor kernel change since quota calls

to make it to network filesystems or deviceless filesystems)



i) investigate sync behavior (including syncpage) and check  

h) investigate sync behavior (including syncpage) and check  

for proper behavior of intr/nointr



i) improve support for very old servers (OS/2 and Win9x for example)

Including support for changing the time remotely (utimes command).



j) hook lower into the sockets api (as NFS/SunRPC does) to avoid the

extra copy in/out of the socket buffers in some cases.

fs/cifs/cifs_dfs_ref.c

+1 −48
Original line number Diff line number Diff line
@@ -219,53 +219,6 @@ static struct vfsmount *cifs_dfs_do_refmount(const struct vfsmount *mnt_parent, 


}



static char *build_full_dfs_path_from_dentry(struct dentry *dentry)

{

	char *full_path = NULL;

	char *search_path;

	char *tmp_path;

	size_t l_max_len;

	struct cifs_sb_info *cifs_sb;



	if (dentry->d_inode == NULL)

		return NULL;



	cifs_sb = CIFS_SB(dentry->d_inode->i_sb);



	if (cifs_sb->tcon == NULL)

		return NULL;



	search_path = build_path_from_dentry(dentry);

	if (search_path == NULL)

		return NULL;



	if (cifs_sb->tcon->Flags & SMB_SHARE_IS_IN_DFS) {

		int i;

		/* we should use full path name for correct working with DFS */

		l_max_len = strnlen(cifs_sb->tcon->treeName, MAX_TREE_SIZE+1) +

					strnlen(search_path, MAX_PATHCONF) + 1;

		tmp_path = kmalloc(l_max_len, GFP_KERNEL);

		if (tmp_path == NULL) {

			kfree(search_path);

			return NULL;

		}

		strncpy(tmp_path, cifs_sb->tcon->treeName, l_max_len);

		tmp_path[l_max_len-1] = 0;

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)

			for (i = 0; i < l_max_len; i++) {

				if (tmp_path[i] == '\\')

					tmp_path[i] = '/';

			}

		strncat(tmp_path, search_path, l_max_len - strlen(tmp_path));



		full_path = tmp_path;

		kfree(search_path);

	} else {

		full_path = search_path;

	}

	return full_path;

}



static int add_mount_helper(struct vfsmount *newmnt, struct nameidata *nd,

				struct list_head *mntlist)

{
@@ -333,7 +286,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
		goto out_err;

	}



	full_path = build_full_dfs_path_from_dentry(dentry);

	full_path = build_path_from_dentry(dentry);

	if (full_path == NULL) {

		rc = -ENOMEM;

		goto out_err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE