Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+2
-2
fs/cifs/connect.c
+2
-2
fs/cifs/connect.c
···
2195
2195
if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING)
2196
2196
tcon->nohandlecache = ctx->nohandlecache;
2197
2197
else
2198
-
tcon->nohandlecache = 1;
2198
+
tcon->nohandlecache = true;
2199
2199
tcon->nodelete = ctx->nodelete;
2200
2200
tcon->local_lease = ctx->local_lease;
2201
2201
INIT_LIST_HEAD(&tcon->pending_opens);
···
2628
2628
} else if (ctx)
2629
2629
tcon->unix_ext = 1; /* Unix Extensions supported */
2630
2630
2631
-
if (tcon->unix_ext == 0) {
2631
+
if (!tcon->unix_ext) {
2632
2632
cifs_dbg(FYI, "Unix extensions disabled so not set on reconnect\n");
2633
2633
return;
2634
2634
}
+2
-2
fs/cifs/transport.c
+2
-2
fs/cifs/transport.c
···
338
338
if (ssocket == NULL)
339
339
return -EAGAIN;
340
340
341
-
if (signal_pending(current)) {
341
+
if (fatal_signal_pending(current)) {
342
342
cifs_dbg(FYI, "signal pending before send request\n");
343
343
return -ERESTARTSYS;
344
344
}
···
429
429
430
430
if (signal_pending(current) && (total_len != send_length)) {
431
431
cifs_dbg(FYI, "signal is pending after attempt to send\n");
432
-
rc = -EINTR;
432
+
rc = -ERESTARTSYS;
433
433
}
434
434
435
435
/* uncork it */