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

Commit 5cdec1fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: mangle existing header for SMB_COM_NT_CANCEL
  cifs: remove code for setting timeouts on requests
  [CIFS] cifs: reconnect unresponsive servers
  cifs: set up recurring workqueue job to do SMB echo requests
  cifs: add ability to send an echo request
  cifs: add cifs_call_async
  cifs: allow for different handling of received response
  cifs: clean up sync_mid_result
  cifs: don't reconnect server when we don't get a response
  cifs: wait indefinitely for responses
  cifs: Use mask of ACEs for SID Everyone to calculate all three permissions user, group, and other
  cifs: Fix regression during share-level security mounts (Repost)
  [CIFS] Update cifs version number
  cifs: move mid result processing into common function
  cifs: move locked sections out of DeleteMidQEntry and AllocMidQEntry
  cifs: clean up accesses to midCount
  cifs: make wait_for_free_request take a TCP_Server_Info pointer
  cifs: no need to mark smb_ses_list as cifs_demultiplex_thread is exiting
  cifs: don't fail writepages on -EAGAIN errors
  CIFS: Fix oplock break handling (try #2)
parents e55fdbd7 76dcc26f

fs/cifs/cifs_debug.c

+5 −5
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ void cifs_dump_mids(struct TCP_Server_Info *server) 
	spin_lock(&GlobalMid_Lock);

	list_for_each(tmp, &server->pending_mid_q) {

		mid_entry = list_entry(tmp, struct mid_q_entry, qhead);

		cERROR(1, "State: %d Cmd: %d Pid: %d Tsk: %p Mid %d",

		cERROR(1, "State: %d Cmd: %d Pid: %d Cbdata: %p Mid %d",

			mid_entry->midState,

			(int)mid_entry->command,

			mid_entry->pid,

			mid_entry->tsk,

			mid_entry->callback_data,

			mid_entry->mid);

#ifdef CONFIG_CIFS_STATS2

		cERROR(1, "IsLarge: %d buf: %p time rcv: %ld now: %ld",
@@ -218,11 +218,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
				mid_entry = list_entry(tmp3, struct mid_q_entry,

					qhead);

				seq_printf(m, "\tState: %d com: %d pid:"

						" %d tsk: %p mid %d\n",

						" %d cbdata: %p mid %d\n",

						mid_entry->midState,

						(int)mid_entry->command,

						mid_entry->pid,

						mid_entry->tsk,

						mid_entry->callback_data,

						mid_entry->mid);

			}

			spin_unlock(&GlobalMid_Lock);
@@ -331,7 +331,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
				atomic_read(&totSmBufAllocCount));

#endif /* CONFIG_CIFS_STATS2 */



	seq_printf(m, "Operations (MIDs): %d\n", midCount.counter);

	seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));

	seq_printf(m,

		"\n%d session %d share reconnects\n",

		tcpSesReconnectCount.counter, tconInfoReconnectCount.counter);

fs/cifs/cifsacl.c

+11 −2
Original line number Diff line number Diff line
@@ -41,9 +41,12 @@ static struct cifs_wksid wksidarr[NUM_WK_SIDS] = { 
;





/* security id for everyone */

/* security id for everyone/world system group */

static const struct cifs_sid sid_everyone = {

	1, 1, {0, 0, 0, 0, 0, 1}, {0} };

/* security id for Authenticated Users system group */

static const struct cifs_sid sid_authusers = {

	1, 1, {0, 0, 0, 0, 0, 5}, {11} };

/* group users */

static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };
@@ -365,7 +368,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 
	if (num_aces  > 0) {

		umode_t user_mask = S_IRWXU;

		umode_t group_mask = S_IRWXG;

		umode_t other_mask = S_IRWXO;

		umode_t other_mask = S_IRWXU | S_IRWXG | S_IRWXO;



		ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),

				GFP_KERNEL);
@@ -390,6 +393,12 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 
						     ppace[i]->type,

						     &fattr->cf_mode,

						     &other_mask);

			if (compare_sids(&(ppace[i]->sid), &sid_authusers))

				access_flags_to_mode(ppace[i]->access_req,

						     ppace[i]->type,

						     &fattr->cf_mode,

						     &other_mask);





/*			memcpy((void *)(&(cifscred->aces[i])),

				(void *)ppace[i],

fs/cifs/cifsfs.c

+5 −1
Original line number Diff line number Diff line
@@ -77,7 +77,11 @@ unsigned int cifs_max_pending = CIFS_MAX_REQ; 
module_param(cifs_max_pending, int, 0);

MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. "

				   "Default: 50 Range: 2 to 256");



unsigned short echo_retries = 5;

module_param(echo_retries, ushort, 0644);

MODULE_PARM_DESC(echo_retries, "Number of echo attempts before giving up and "

			       "reconnecting server. Default: 5. 0 means "

			       "never reconnect.");

extern mempool_t *cifs_sm_req_poolp;

extern mempool_t *cifs_req_poolp;

extern mempool_t *cifs_mid_poolp;

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -118,5 +118,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.68"

#define CIFS_VERSION   "1.69"

#endif				/* _CIFSFS_H */

fs/cifs/cifsglob.h

+21 −7
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct TCP_Server_Info { 
	bool	sec_kerberosu2u;	/* supports U2U Kerberos */

	bool	sec_ntlmssp;		/* supports NTLMSSP */

	bool session_estab; /* mark when very first sess is established */

	struct delayed_work	echo; /* echo ping workqueue job */

#ifdef CONFIG_CIFS_FSCACHE

	struct fscache_cookie   *fscache; /* client index cache cookie */

#endif
@@ -508,6 +509,18 @@ static inline void cifs_stats_bytes_read(struct cifsTconInfo *tcon, 


#endif



struct mid_q_entry;



/*

 * This is the prototype for the mid callback function. When creating one,

 * take special care to avoid deadlocks. Things to bear in mind:

 *

 * - it will be called by cifsd

 * - the GlobalMid_Lock will be held

 * - the mid will be removed from the pending_mid_q list

 */

typedef void (mid_callback_t)(struct mid_q_entry *mid);



/* one of these for every pending CIFS request to the server */

struct mid_q_entry {

	struct list_head qhead;	/* mids waiting on reply from this server */
@@ -519,7 +532,8 @@ struct mid_q_entry { 
	unsigned long when_sent; /* time when smb send finished */

	unsigned long when_received; /* when demux complete (taken off wire) */

#endif

	struct task_struct *tsk;	/* task waiting for response */

	mid_callback_t *callback; /* call completion callback */

	void *callback_data;	  /* general purpose pointer for callback */

	struct smb_hdr *resp_buf;	/* response buffer */

	int midState;	/* wish this were enum but can not pass to wait_event */

	__u8 command;	/* smb command code */
@@ -622,12 +636,9 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, 
#define   CIFS_IOVEC            4    /* array of response buffers */



/* Type of Request to SendReceive2 */

#define   CIFS_STD_OP	        0    /* normal request timeout */

#define   CIFS_LONG_OP          1    /* long op (up to 45 sec, oplock time) */

#define   CIFS_VLONG_OP         2    /* sloow op - can take up to 180 seconds */

#define   CIFS_BLOCKING_OP      4    /* operation can block */

#define   CIFS_ASYNC_OP         8    /* do not wait for response */

#define   CIFS_TIMEOUT_MASK 0x00F    /* only one of 5 above set in req */

#define   CIFS_BLOCKING_OP      1    /* operation can block */

#define   CIFS_ASYNC_OP         2    /* do not wait for response */

#define   CIFS_TIMEOUT_MASK 0x003    /* only one of above set in req */

#define   CIFS_LOG_ERROR    0x010    /* log NT STATUS if non-zero */

#define   CIFS_LARGE_BUF_OP 0x020    /* large request buffer */

#define   CIFS_NO_RESP      0x040    /* no response buffer required */
@@ -790,6 +801,9 @@ GLOBAL_EXTERN unsigned int cifs_min_rcv; /* min size of big ntwrk buf pool */ 
GLOBAL_EXTERN unsigned int cifs_min_small;  /* min size of small buf pool */

GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/



/* reconnect after this many failed echo attempts */

GLOBAL_EXTERN unsigned short echo_retries;



void cifs_oplock_break(struct work_struct *work);

void cifs_oplock_break_get(struct cifsFileInfo *cfile);

void cifs_oplock_break_put(struct cifsFileInfo *cfile);