Commit 4dcd3bcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.11-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "An important signal handling patch for stable, and two small cleanup
  patches"

* tag '5.11-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: do not fail __smb_send_rqst if non-fatal signals are pending
  fs/cifs: Simplify bool comparison.
  fs/cifs: Assign boolean values to a bool variable
parents e1ae4b0b 214a5ea0

fs/cifs/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -2195,7 +2195,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) 
	if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING)

		tcon->nohandlecache = ctx->nohandlecache;

	else

		tcon->nohandlecache = 1;

		tcon->nohandlecache = true;

	tcon->nodelete = ctx->nodelete;

	tcon->local_lease = ctx->local_lease;

	INIT_LIST_HEAD(&tcon->pending_opens);
@@ -2628,7 +2628,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon, 
	} else if (ctx)

		tcon->unix_ext = 1; /* Unix Extensions supported */



	if (tcon->unix_ext == 0) {

	if (!tcon->unix_ext) {

		cifs_dbg(FYI, "Unix extensions disabled so not set on reconnect\n");

		return;

	}

fs/cifs/transport.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, 
	if (ssocket == NULL)

		return -EAGAIN;



	if (signal_pending(current)) {

	if (fatal_signal_pending(current)) {

		cifs_dbg(FYI, "signal pending before send request\n");

		return -ERESTARTSYS;

	}
@@ -429,7 +429,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, 


	if (signal_pending(current) && (total_len != send_length)) {

		cifs_dbg(FYI, "signal is pending after attempt to send\n");

		rc = -EINTR;

		rc = -ERESTARTSYS;

	}



	/* uncork it */