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

Commit 2a212f69 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] cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled
  [CIFS] Fix hang in mount when negprot causes server to kill tcp session
  disable most mode changes on non-unix/non-cifsacl mounts
  [CIFS] Correct incorrect obscure open flag
  [CIFS] warn if both dynperm and cifsacl mount options specified
  silently ignore ownership changes unless unix extensions are enabled or we're faking uid changes
  [CIFS] remove trailing whitespace
  when creating new inodes, use file_mode/dir_mode exclusively on mount without unix extensions
  on non-posix shares, clear write bits in mode when ATTR_READONLY is set
  [CIFS] remove unused variables
parents f7f866ee 79ee9a8b

fs/cifs/CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ Version 1.53 
------------

DFS support added (Microsoft Distributed File System client support needed

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

Disable temporary caching of mode bits to servers which do not support

storing of mode (e.g. Windows servers, when client mounts without cifsacl

mount option) and add new "dynperm" mount option to enable temporary caching

of mode (enable old behavior).  Fix hang on mount caused when server crashes

tcp session during negotiate protocol.



Version 1.52

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

fs/cifs/cifsfs.c

+10 −11
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ cifs_read_super(struct super_block *sb, void *data, 
{

	struct inode *inode;

	struct cifs_sb_info *cifs_sb;

#ifdef CONFIG_CIFS_DFS_UPCALL

	int len;

#endif

	int rc = 0;



	/* BB should we make this contingent on mount parm? */
@@ -117,7 +114,8 @@ cifs_read_super(struct super_block *sb, void *data, 
	 * complex operation (mount), and in case of fail

	 * just exit instead of doing mount and attempting

	 * undo it if this copy fails?*/

	len = strlen(data);

	if (data) {

		int len = strlen(data);

		cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL);

		if (cifs_sb->mountdata == NULL) {

			kfree(sb->s_fs_info);
@@ -126,6 +124,7 @@ cifs_read_super(struct super_block *sb, void *data, 
		}

		strncpy(cifs_sb->mountdata, data, len + 1);

		cifs_sb->mountdata[len] = '\0';

	}

#endif



	rc = cifs_mount(sb, cifs_sb, data, devname);

fs/cifs/cifsglob.h

+1 −2
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ struct cifsFileInfo { 
	bool messageMode:1;	/* for pipes: message vs byte mode */

	atomic_t wrtPending;   /* handle in use - defer close */

	struct semaphore fh_sem; /* prevents reopen race after dead ses*/

	char *search_resume_name; /* BB removeme BB */

	struct cifs_search_info srch_inf;

};
@@ -626,7 +625,7 @@ GLOBAL_EXTERN atomic_t tcpSesAllocCount; 
GLOBAL_EXTERN atomic_t tcpSesReconnectCount;

GLOBAL_EXTERN atomic_t tconInfoReconnectCount;



/* Various Debug counters to remove someday (BB) */

/* Various Debug counters */

GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */

#ifdef CONFIG_CIFS_STATS2

GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */

fs/cifs/cifspdu.h

+18 −5
Original line number Diff line number Diff line
@@ -79,6 +79,19 @@ 
#define TRANS2_GET_DFS_REFERRAL       0x10

#define TRANS2_REPORT_DFS_INCOSISTENCY 0x11



/* SMB Transact (Named Pipe) subcommand codes */

#define TRANS_SET_NMPIPE_STATE      0x0001

#define TRANS_RAW_READ_NMPIPE       0x0011

#define TRANS_QUERY_NMPIPE_STATE    0x0021

#define TRANS_QUERY_NMPIPE_INFO     0x0022

#define TRANS_PEEK_NMPIPE           0x0023

#define TRANS_TRANSACT_NMPIPE       0x0026

#define TRANS_RAW_WRITE_NMPIPE      0x0031

#define TRANS_READ_NMPIPE           0x0036

#define TRANS_WRITE_NMPIPE          0x0037

#define TRANS_WAIT_NMPIPE           0x0053

#define TRANS_CALL_NMPIPE           0x0054



/* NT Transact subcommand codes */

#define NT_TRANSACT_CREATE            0x01

#define NT_TRANSACT_IOCTL             0x02
@@ -328,12 +341,13 @@ 
#define CREATE_COMPLETE_IF_OPLK 0x00000100	/* should be zero */

#define CREATE_NO_EA_KNOWLEDGE  0x00000200

#define CREATE_EIGHT_DOT_THREE  0x00000400	/* doc says this is obsolete

						 open for recovery flag - should

						 be zero */

						 "open for recovery" flag - should

						 be zero in any case */

#define CREATE_OPEN_FOR_RECOVERY 0x00000400

#define CREATE_RANDOM_ACCESS	0x00000800

#define CREATE_DELETE_ON_CLOSE	0x00001000

#define CREATE_OPEN_BY_ID       0x00002000

#define CREATE_OPEN_BACKUP_INTN 0x00004000

#define CREATE_OPEN_BACKUP_INTENT 0x00004000

#define CREATE_NO_COMPRESSION   0x00008000

#define CREATE_RESERVE_OPFILTER 0x00100000	/* should be zero */

#define OPEN_REPARSE_POINT	0x00200000
@@ -722,7 +736,6 @@ typedef struct smb_com_tconx_rsp_ext { 
#define SMB_CSC_CACHE_AUTO_REINT   0x0004

#define SMB_CSC_CACHE_VDO          0x0008

#define SMB_CSC_NO_CACHING         0x000C



#define SMB_UNIQUE_FILE_NAME    0x0010

#define SMB_EXTENDED_SIGNATURES 0x0020
@@ -806,7 +819,7 @@ typedef struct smb_com_findclose_req { 
#define ICOUNT_MASK		0x00FF

#define PIPE_READ_MODE		0x0100

#define NAMED_PIPE_TYPE		0x0400

#define PIPE_END_POINT		0x0800

#define PIPE_END_POINT		0x4000

#define BLOCKING_NAMED_PIPE	0x8000



typedef struct smb_com_open_req {	/* also handles create */

fs/cifs/cifssmb.c

+2 −4
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 
{

	int rc = 0;

	LOCK_REQ *pSMB = NULL;

	LOCK_RSP *pSMBr = NULL;

/*	LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */

	int bytes_returned;

	int timeout = 0;

	__u16 count;
@@ -1739,8 +1739,6 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 
	if (rc)

		return rc;



	pSMBr = (LOCK_RSP *)pSMB; /* BB removeme BB */



	if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {

		timeout = CIFS_ASYNC_OP; /* no response expected */

		pSMB->Timeout = 0;
@@ -1774,7 +1772,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, 


	if (waitFlag) {

		rc = SendReceiveBlockingLock(xid, tcon, (struct smb_hdr *) pSMB,

			(struct smb_hdr *) pSMBr, &bytes_returned);

			(struct smb_hdr *) pSMB, &bytes_returned);

		cifs_small_buf_release(pSMB);

	} else {

		rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB,