From af7caad8ef15f00fc4dffc1b827b4292ff0db62c Mon Sep 17 00:00:00 2001 From: Prashanth Badari Date: Sat, 13 Jun 2020 03:43:09 +0000 Subject: 13873 SMB shutdown hang with CA handles Reviewed by: Suresh Jayaraman Reviewed by: Gordon Ross Reviewed by: Andrew Stormont Reviewed by: Toomas Soome Approved by: Garrett D'Amore --- usr/src/uts/common/fs/smbsrv/smb2_durable.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/fs/smbsrv/smb2_durable.c b/usr/src/uts/common/fs/smbsrv/smb2_durable.c index 2e68090ed4..41bd824b60 100644 --- a/usr/src/uts/common/fs/smbsrv/smb2_durable.c +++ b/usr/src/uts/common/fs/smbsrv/smb2_durable.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2019 Nexenta by DDN, Inc. All rights reserved. + * Copyright 2020 Tintri by DDN, Inc. All rights reserved. */ /* @@ -359,6 +359,12 @@ smb2_dh_import_share(void *arg) if (shr->shr_flags & SMB_SHRF_REMOVED) break; + /* + * If the server's stopping, no point importing. + */ + if (smb_server_is_stopping(sr->sr_server)) + break; + /* * Read a stream name and info */ @@ -392,6 +398,7 @@ smb2_dh_import_share(void *arg) of = NULL; } sr->fid_ofile = NULL; + smb_llist_flush(&sr->tid_tree->t_ofile_list); } while (!eof); -- cgit v1.2.3