Commit 91444f47 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: (32 commits)
  [CIFS] Fix to problem with getattr caused by invalidate simplification patch
  [CIFS] Remove sparse warning
  [CIFS] Update cifs to version 1.72
  cifs: Change key name to cifs.idmap, misc. clean-up
  cifs: Unconditionally copy mount options to superblock info
  cifs: Use kstrndup for cifs_sb->mountdata
  cifs: Simplify handling of submount options in cifs_mount.
  cifs: cifs_parse_mount_options: do not tokenize mount options in-place
  cifs: Add support for mounting Windows 2008 DFS shares
  cifs: Extract DFS referral expansion logic to separate function
  cifs: turn BCC into a static inlined function
  cifs: keep BCC in little-endian format
  cifs: fix some unused variable warnings in id_rb_search
  CIFS: Simplify invalidate part (try #5)
  CIFS: directio read/write cleanups
  consistently use smb_buf_length as be32 for cifs (try 3)
  cifs: Invoke id mapping functions (try #17 repost)
  cifs: Add idmap key and related data structures and functions (try #17 repost)
  CIFS: Add launder_page operation (try #3)
  Introduce smb2 mounts as vers=2
  ...
parents bc091c93 156ecb2d

fs/cifs/Kconfig

+24 −11
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config CIFS 
	select CRYPTO_MD5

	select CRYPTO_HMAC

	select CRYPTO_ARC4

	select CRYPTO_DES

	help

	  This is the client VFS module for the Common Internet File System

	  (CIFS) protocol which is the successor to the Server Message Block
@@ -152,16 +153,28 @@ config CIFS_ACL 
	    Allows to fetch CIFS/NTFS ACL from the server.  The DACL blob

	    is handed over to the application/caller.



config CIFS_EXPERIMENTAL

	  bool "CIFS Experimental Features (EXPERIMENTAL)"

config CIFS_SMB2

	bool "SMB2 network file system support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && INET && BROKEN

	select NLS

	select KEYS

	select FSCACHE

	select DNS_RESOLVER



	help

	  This enables experimental support for the SMB2 (Server Message Block

	  version 2) protocol. The SMB2 protocol is the successor to the

	  popular CIFS and SMB network file sharing protocols. SMB2 is the

	  native file sharing mechanism for recent versions of Windows

	  operating systems (since Vista).  SMB2 enablement will eventually

	  allow users better performance, security and features, than would be

	  possible with cifs. Note that smb2 mount options also are simpler

	  (compared to cifs) due to protocol improvements.



	  Unless you are a developer or tester, say N.



config CIFS_NFSD_EXPORT

	  bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)"

	  depends on CIFS && EXPERIMENTAL

	  help

	    Enables cifs features under testing. These features are

	    experimental and currently include DFS support and directory

	    change notification ie fcntl(F_DNOTIFY), as well as the upcall

	    mechanism which will be used for Kerberos session negotiation

	    and uid remapping.  Some of these features also may depend on

	    setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental

	    (which is disabled by default). See the file fs/cifs/README

	    for more details.  If unsure, say N.

	   Allows NFS server to export a CIFS mounted share (nfsd over cifs)

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
obj-$(CONFIG_CIFS) += cifs.o



cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \

	  link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o \

	  link.o misc.o netmisc.o smbencrypt.o transport.o asn1.o \

	  cifs_unicode.o nterr.o xattr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o

fs/cifs/README

+0 −12
Original line number Diff line number Diff line
@@ -704,18 +704,6 @@ the start of smb requests and responses can be enabled via: 


	echo 1 > /proc/fs/cifs/traceSMB



Two other experimental features are under development. To test these

requires enabling CONFIG_CIFS_EXPERIMENTAL



	cifsacl support needed to retrieve approximated mode bits based on

		the contents on the CIFS ACL.



	lease support: cifs will check the oplock state before calling into

	the vfs to see if we can grant a lease on a file.



	DNOTIFY fcntl: needed for support of directory change 

			    notification and perhaps later for file leases)



Per share (per client mount) statistics are available in /proc/fs/cifs/Stats

if the kernel was configured with cifs statistics enabled.  The statistics

represent the number of successful (ie non-zero return code from the server)

fs/cifs/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void cifs_dump_detail(struct smb_hdr *smb) 
	cERROR(1, "Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d",

		  smb->Command, smb->Status.CifsError,

		  smb->Flags, smb->Flags2, smb->Mid, smb->Pid);

	cERROR(1, "smb buf %p len %d", smb, smbCalcSize_LE(smb));

	cERROR(1, "smb buf %p len %d", smb, smbCalcSize(smb));

}

fs/cifs/cifs_fs_sb.h

+1 −3
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ struct cifs_sb_info { 
	unsigned int mnt_cifs_flags;

	int	prepathlen;

	char   *prepath; /* relative path under the share to mount to */

#ifdef CONFIG_CIFS_DFS_UPCALL

	char   *mountdata; /* mount options received at mount time */

#endif

	char   *mountdata; /* options received at mount time or via DFS refs */

	struct backing_dev_info bdi;

	struct delayed_work prune_tlinks;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE