Skip to content

Commit 6988a61

Browse files
Paulo Alcantarasmfrench
authored andcommitted
cifs: allow syscalls to be restarted in __smb_send_rqst()
A customer has reported that several files in their multi-threaded app were left with size of 0 because most of the read(2) calls returned -EINTR and they assumed no bytes were read. Obviously, they could have fixed it by simply retrying on -EINTR. We noticed that most of the -EINTR on read(2) were due to real-time signals sent by glibc to process wide credential changes (SIGRT_1), and its signal handler had been established with SA_RESTART, in which case those calls could have been automatically restarted by the kernel. Let the kernel decide to whether or not restart the syscalls when there is a signal pending in __smb_send_rqst() by returning -ERESTARTSYS. If it can't, it will return -EINTR anyway. Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz> CC: Stable <stable@vger.kernel.org> Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent b650545 commit 6988a61

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/cifs/transport.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
339339
return -EAGAIN;
340340

341341
if (signal_pending(current)) {
342-
cifs_dbg(FYI, "signal is pending before sending any data\n");
343-
return -EINTR;
342+
cifs_dbg(FYI, "signal pending before send request\n");
343+
return -ERESTARTSYS;
344344
}
345345

346346
/* cork the socket */

0 commit comments

Comments
 (0)