diff options
author | Prashanth Badari <prashanth.badari@tegile.com> | 2020-06-13 03:43:09 +0000 |
---|---|---|
committer | Gordon Ross <gordon.ross@tintri.com> | 2021-07-15 15:42:57 -0400 |
commit | af7caad8ef15f00fc4dffc1b827b4292ff0db62c (patch) | |
tree | 2bb8c6781f87a593850602e052b8860fff023325 /usr/src | |
parent | 390ca21a12b3e3353546a4293f926ef7eef449d9 (diff) | |
download | illumos-joyent-af7caad8ef15f00fc4dffc1b827b4292ff0db62c.tar.gz |
13873 SMB shutdown hang with CA handles
Reviewed by: Suresh Jayaraman <sjayaraman@tintri.com>
Reviewed by: Gordon Ross <gordon.ross@tintri.com>
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/uts/common/fs/smbsrv/smb2_durable.c | 9 |
1 files changed, 8 insertions, 1 deletions
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. */ /* @@ -360,6 +360,12 @@ smb2_dh_import_share(void *arg) break; /* + * If the server's stopping, no point importing. + */ + if (smb_server_is_stopping(sr->sr_server)) + break; + + /* * Read a stream name and info */ rc = smb_odir_read_streaminfo(sr, od, str_info, &eof); @@ -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); |