From: Paulo Alcantara <pc@cjr.nz>
Date: Wed, 13 Jan 2021 17:16:16 +0000 (-0300)
Subject: cifs: fix interrupted close commands
X-Git-Tag: v5.4.91~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c553300f1453c4bec9b2ba715d327b238963459d;p=thirdparty%2Fkernel%2Fstable.git

cifs: fix interrupted close commands

[ Upstream commit 2659d3bff3e1b000f49907d0839178b101a89887 ]

Retry close command if it gets interrupted to not leak open handles on
the server.

Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reported-by: Duncan Findlay <duncf@duncf.ca>
Suggested-by: Pavel Shilovsky <pshilov@microsoft.com>
Fixes: 6988a619f5b7 ("cifs: allow syscalls to be restarted in __smb_send_rqst()")
Cc: stable@vger.kernel.org
Reviewd-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index c095f2e6b0825..be06b26d6ca03 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2996,7 +2996,7 @@ close_exit:
 	free_rsp_buf(resp_buftype, rsp);
 
 	/* retry close in a worker thread if this one is interrupted */
-	if (rc == -EINTR) {
+	if (is_interrupt_error(rc)) {
 		int tmp_rc;
 
 		tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,