Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eeab61a authored Sep 22, 2006 by Linus Torvalds

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] statfs for cifs unix extensions no longer experimental
  [CIFS] New POSIX locking code not setting rc properly to zero on successful
  [CIFS] Support deep tree mounts (e.g. mounts to //server/share/path)

parents 6585b572 b8c06a2a

fs/cifs/CHANGES

+6 −1

Original line number	Original line	Diff line number	Diff line
			Version 1.46
			------------
			Support deep tree mounts. Better support OS/2, Win9x (DOS) time stamps.

	Version 1.45		Version 1.45
	------------		------------
	Do not time out lockw calls when using posix extensions. Do not		Do not time out lockw calls when using posix extensions. Do not
	@@ -6,7 +10,8 @@ on requests on other threads. Improve POSIX locking emulation,
	(lock cancel now works, and unlock of merged range works even		(lock cancel now works, and unlock of merged range works even
	to Windows servers now). Fix oops on mount to lanman servers		to Windows servers now). Fix oops on mount to lanman servers
	(win9x, os/2 etc.) when null password. Do not send listxattr		(win9x, os/2 etc.) when null password. Do not send listxattr
	(SMB to query all EAs) if nouser_xattr specified.		(SMB to query all EAs) if nouser_xattr specified. Fix SE Linux
			problem (instantiate inodes/dentries in right order for readdir).

	Version 1.44		Version 1.44
	------------		------------

fs/cifs/cifs_fs_sb.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,5 +40,7 @@ struct cifs_sb_info {
	mode_t mnt_file_mode;		mode_t mnt_file_mode;
	mode_t mnt_dir_mode;		mode_t mnt_dir_mode;
	int mnt_cifs_flags;		int mnt_cifs_flags;
			int prepathlen;
			char * prepath;
	};		};
	#endif /* _CIFS_FS_SB_H */		#endif /* _CIFS_FS_SB_H */

fs/cifs/cifsfs.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,6 @@ cifs_statfs(struct dentry dentry, struct kstatfs buf)
	buf->f_files = 0; /* undefined */		buf->f_files = 0; /* undefined */
	buf->f_ffree = 0; /* unlimited */		buf->f_ffree = 0; /* unlimited */

	#ifdef CONFIG_CIFS_EXPERIMENTAL
	/* BB we could add a second check for a QFS Unix capability bit */		/* BB we could add a second check for a QFS Unix capability bit */
	/* BB FIXME check CIFS_POSIX_EXTENSIONS Unix cap first FIXME BB */		/* BB FIXME check CIFS_POSIX_EXTENSIONS Unix cap first FIXME BB */
	if ((pTcon->ses->capabilities & CAP_UNIX) && (CIFS_POSIX_EXTENSIONS &		if ((pTcon->ses->capabilities & CAP_UNIX) && (CIFS_POSIX_EXTENSIONS &
	@@ -199,7 +198,6 @@ cifs_statfs(struct dentry dentry, struct kstatfs buf)
	/* Only need to call the old QFSInfo if failed		/* Only need to call the old QFSInfo if failed
	on newer one */		on newer one */
	if(rc)		if(rc)
	#endif /* CIFS_EXPERIMENTAL */
	rc = CIFSSMBQFSInfo(xid, pTcon, buf);		rc = CIFSSMBQFSInfo(xid, pTcon, buf);

	/* Old Windows servers do not support level 103, retry with level		/* Old Windows servers do not support level 103, retry with level

fs/cifs/cifsfs.h

+1 −1

Original line number	Original line	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 ssize_t cifs_listxattr(struct dentry , char , size_t);
	extern int cifs_ioctl (struct inode * inode, struct file * filep,		extern int cifs_ioctl (struct inode * inode, struct file * filep,
	unsigned int command, unsigned long arg);		unsigned int command, unsigned long arg);
	#define CIFS_VERSION "1.45"		#define CIFS_VERSION "1.46"
	#endif /* _CIFSFS_H */		#endif /* _CIFSFS_H */

fs/cifs/cifspdu.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1344,6 +1344,7 @@ struct smb_t2_rsp {
	#define SMB_QUERY_ATTR_FLAGS 0x206 /* append,immutable etc. */		#define SMB_QUERY_ATTR_FLAGS 0x206 /* append,immutable etc. */
	#define SMB_QUERY_POSIX_PERMISSION 0x207		#define SMB_QUERY_POSIX_PERMISSION 0x207
	#define SMB_QUERY_POSIX_LOCK 0x208		#define SMB_QUERY_POSIX_LOCK 0x208
			/* #define SMB_POSIX_OPEN 0x209 */
	#define SMB_QUERY_FILE_INTERNAL_INFO 0x3ee		#define SMB_QUERY_FILE_INTERNAL_INFO 0x3ee
	#define SMB_QUERY_FILE_ACCESS_INFO 0x3f0		#define SMB_QUERY_FILE_ACCESS_INFO 0x3f0
	#define SMB_QUERY_FILE_NAME_INFO2 0x3f1 /* 0x30 bytes */		#define SMB_QUERY_FILE_NAME_INFO2 0x3f1 /* 0x30 bytes */
	@@ -1363,6 +1364,7 @@ struct smb_t2_rsp {
	#define SMB_SET_XATTR 0x205		#define SMB_SET_XATTR 0x205
	#define SMB_SET_ATTR_FLAGS 0x206 /* append, immutable etc. */		#define SMB_SET_ATTR_FLAGS 0x206 /* append, immutable etc. */
	#define SMB_SET_POSIX_LOCK 0x208		#define SMB_SET_POSIX_LOCK 0x208
			#define SMB_POSIX_OPEN 0x209
	#define SMB_SET_FILE_BASIC_INFO2 0x3ec		#define SMB_SET_FILE_BASIC_INFO2 0x3ec
	#define SMB_SET_FILE_RENAME_INFORMATION 0x3f2 /* BB check if qpathinfo level too */		#define SMB_SET_FILE_RENAME_INFORMATION 0x3f2 /* BB check if qpathinfo level too */
	#define SMB_FILE_ALL_INFO2 0x3fa		#define SMB_FILE_ALL_INFO2 0x3fa