| From 902aa36480986f214e1e2c3d569df24ab2a9d134 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 23 Jul 2019 22:14:29 -0500 |
| Subject: cifs: fix rmmod regression in cifs.ko caused by force_sig changes |
| |
| From: Steve French <stfrench@microsoft.com> |
| |
| [ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ] |
| |
| Fixes: 72abe3bcf091 ("signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig") |
| |
| The global change from force_sig caused module unloading of cifs.ko |
| to fail (since the cifsd process could not be killed, "rmmod cifs" |
| now would always fail) |
| |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> |
| CC: Eric W. Biederman <ebiederm@xmission.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/cifs/connect.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c |
| index 110febd697379..7d46025d5e899 100644 |
| --- a/fs/cifs/connect.c |
| +++ b/fs/cifs/connect.c |
| @@ -885,6 +885,7 @@ cifs_demultiplex_thread(void *p) |
| mempool_resize(cifs_req_poolp, length + cifs_min_rcv); |
| |
| set_freezable(); |
| + allow_signal(SIGKILL); |
| while (server->tcpStatus != CifsExiting) { |
| if (try_to_freeze()) |
| continue; |
| -- |
| 2.20.1 |
| |
