Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (710320d5) · Commits · 戴 / test

fs/cifs/CHANGES

+14 −1

Original line number	Diff line number	Diff line
		Version 1.57
		------------
		Improve support for multiple security contexts to the same server. We
		used to use the same "vcnumber" for all connections which could cause
		the server to treat subsequent connections, especially those that
		are authenticated as guest, as reconnections, invalidating the earlier
		user's smb session. This fix allows cifs to mount multiple times to the
		same server with different userids without risking invalidating earlier
		established security contexts.

		Version 1.56
		------------
		Add "forcemandatorylock" mount option to allow user to use mandatory
		@@ -7,7 +17,10 @@ specified and user does not have access to query information about the
		top of the share. Fix problem in 2.6.28 resolving DFS paths to
		Samba servers (worked to Windows). Fix rmdir so that pending search
		(readdir) requests do not get invalid results which include the now
		removed directory.
		removed directory. Fix oops in cifs_dfs_ref.c when prefixpath is not reachable
		when using DFS. Add better file create support to servers which support
		the CIFS POSIX protocol extensions (this adds support for new flags
		on create, and improves semantics for write of locked ranges).

		Version 1.55
		------------

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,5 +100,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
		extern const struct export_operations cifs_export_ops;
		#endif /* EXPERIMENTAL */

		#define CIFS_VERSION "1.56"
		#define CIFS_VERSION "1.57"
		#endif /* _CIFSFS_H */

+5 −1

Original line number	Diff line number	Diff line
		@@ -164,9 +164,12 @@ struct TCP_Server_Info {
		/* multiplexed reads or writes */
		unsigned int maxBuf; /* maxBuf specifies the maximum */
		/* message size the server can send or receive for non-raw SMBs */
		unsigned int maxRw; /* maxRw specifies the maximum */
		unsigned int max_rw; /* maxRw specifies the maximum */
		/* message size the server can send or receive for */
		/* SMB_COM_WRITE_RAW or SMB_COM_READ_RAW. */
		unsigned int max_vcs; /* maximum number of smb sessions, at least
		those that can be specified uniquely with
		vcnumbers */
		char sessid[4]; /* unique token id for this session */
		/* (returned on Negotiate */
		int capabilities; /* allow selective disabling of caps by smb sess */
		@@ -210,6 +213,7 @@ struct cifsSesInfo {
		unsigned overrideSecFlg; /* if non-zero override global sec flags */
		__u16 ipc_tid; /* special tid for connection to IPC share */
		__u16 flags;
		__u16 vcnum;
		char serverOS; / name of operating system underlying server */
		char serverNOS; / name of network operating system of server */
		char serverDomain; / security realm of server */

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ extern void _FreeXid(unsigned int);
		#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__func__, xid,current_fsuid()));
		#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__func__,curr_xid,(int)rc));}
		extern char build_path_from_dentry(struct dentry );
		extern char cifs_build_path_to_root(struct cifs_sb_info cifs_sb);
		extern char build_wildcard_path_from_dentry(struct dentry direntry);
		/* extern void renew_parental_timestamps(struct dentry direntry);/
		extern int SendReceive(const unsigned int /* xid / , struct cifsSesInfo ,
		@@ -91,6 +92,9 @@ extern u64 cifs_UnixTimeToNT(struct timespec);
		extern __le64 cnvrtDosCifsTm(__u16 date, __u16 time);
		extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time);

		extern void posix_fill_in_inode(struct inode *tmp_inode,
		FILE_UNIX_BASIC_INFO *pData, int isNewInode);
		extern struct inode cifs_new_inode(struct super_block sb, __u64 *inum);
		extern int cifs_get_inode_info(struct inode **pinode,
		const unsigned char *search_path,
		FILE_ALL_INFO *pfile_info,

+4 −3

Original line number	Diff line number	Diff line
		@@ -528,14 +528,15 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
		server->maxReq = le16_to_cpu(rsp->MaxMpxCount);
		server->maxBuf = min((__u32)le16_to_cpu(rsp->MaxBufSize),
		(__u32)CIFSMaxBufSize + MAX_CIFS_HDR_SIZE);
		server->max_vcs = le16_to_cpu(rsp->MaxNumberVcs);
		GETU32(server->sessid) = le32_to_cpu(rsp->SessionKey);
		/* even though we do not use raw we might as well set this
		accurately, in case we ever find a need for it */
		if ((le16_to_cpu(rsp->RawMode) & RAW_ENABLE) == RAW_ENABLE) {
		server->maxRw = 0xFF00;
		server->max_rw = 0xFF00;
		server->capabilities = CAP_MPX_MODE \| CAP_RAW_MODE;
		} else {
		server->maxRw = 0;/* we do not need to use raw anyway */
		server->max_rw = 0;/* do not need to use raw anyway */
		server->capabilities = CAP_MPX_MODE;
		}
		tmp = (__s16)le16_to_cpu(rsp->ServerTimeZone);
		@@ -638,7 +639,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
		/* probably no need to store and check maxvcs */
		server->maxBuf = min(le32_to_cpu(pSMBr->MaxBufferSize),
		(__u32) CIFSMaxBufSize + MAX_CIFS_HDR_SIZE);
		server->maxRw = le32_to_cpu(pSMBr->MaxRawSize);
		server->max_rw = le32_to_cpu(pSMBr->MaxRawSize);
		cFYI(DBG2, ("Max buf = %d", ses->server->maxBuf));
		GETU32(ses->server->sessid) = le32_to_cpu(pSMBr->SessionKey);
		server->capabilities = le32_to_cpu(pSMBr->Capabilities);