Skip to content

Commit 4dcd3bc

Browse files
committed
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
2 parents e1ae4b0 + 214a5ea commit 4dcd3bc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

fs/cifs/connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,7 +2195,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx)
21952195
if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING)
21962196
tcon->nohandlecache = ctx->nohandlecache;
21972197
else
2198-
tcon->nohandlecache = 1;
2198+
tcon->nohandlecache = true;
21992199
tcon->nodelete = ctx->nodelete;
22002200
tcon->local_lease = ctx->local_lease;
22012201
INIT_LIST_HEAD(&tcon->pending_opens);
@@ -2628,7 +2628,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
26282628
} else if (ctx)
26292629
tcon->unix_ext = 1; /* Unix Extensions supported */
26302630

2631-
if (tcon->unix_ext == 0) {
2631+
if (!tcon->unix_ext) {
26322632
cifs_dbg(FYI, "Unix extensions disabled so not set on reconnect\n");
26332633
return;
26342634
}

fs/cifs/transport.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
338338
if (ssocket == NULL)
339339
return -EAGAIN;
340340

341-
if (signal_pending(current)) {
341+
if (fatal_signal_pending(current)) {
342342
cifs_dbg(FYI, "signal pending before send request\n");
343343
return -ERESTARTSYS;
344344
}
@@ -429,7 +429,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
429429

430430
if (signal_pending(current) && (total_len != send_length)) {
431431
cifs_dbg(FYI, "signal is pending after attempt to send\n");
432-
rc = -EINTR;
432+
rc = -ERESTARTSYS;
433433
}
434434

435435
/* uncork it */

0 commit comments

Comments
 (0)