diff options
author | Steve French <stfrench@microsoft.com> | 2019-07-23 22:14:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-27 14:46:42 +0100 |
commit | f996f9ee615bebddcab67e4ebaeb5ce56956d256 (patch) | |
tree | be202a8af3e9ace8aeb1c8a0ff680d9f503c5ce0 /fs | |
parent | ed1929a76537c41b212adc93013e46dd3f7b46f9 (diff) | |
download | linux-stable-f996f9ee615bebddcab67e4ebaeb5ce56956d256.tar.gz linux-stable-f996f9ee615bebddcab67e4ebaeb5ce56956d256.tar.bz2 linux-stable-f996f9ee615bebddcab67e4ebaeb5ce56956d256.zip |
cifs: fix rmmod regression in cifs.ko caused by force_sig changes
[ 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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/connect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 51bbb1c0b71a..ed4a0352ea90 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -921,6 +921,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; |