diff options
author | Steve French <smfrench@austin.rr.com> | 2005-04-29 01:41:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-29 01:41:11 -0400 |
commit | 31ca3bc3c569f9fe02aae6974ac3a9126f14902f (patch) | |
tree | 1ee90350d3ad6c2c3d59fa598c1440fcdf5a34e8 /fs/cifs/cifssmb.c | |
parent | 57337e42f1393941d59d5154eed27a63988ff2be (diff) |
[PATCH] cifs: Do not init smb requests or block when sending requests
if cifsd thread is no longer running to demultixplex responses.
Do not send FindClose request when FindFirst failed without reaching end
of search.
Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r-- | fs/cifs/cifssmb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index f8edf816b4be..b004fef0a42b 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -90,7 +90,8 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, | |||
90 | check for tcp and smb session status done differently | 90 | check for tcp and smb session status done differently |
91 | for those three - in the calling routine */ | 91 | for those three - in the calling routine */ |
92 | if(tcon) { | 92 | if(tcon) { |
93 | if((tcon->ses) && (tcon->ses->server)){ | 93 | if((tcon->ses) && (tcon->ses->status != CifsExiting) && |
94 | (tcon->ses->server)){ | ||
94 | struct nls_table *nls_codepage; | 95 | struct nls_table *nls_codepage; |
95 | /* Give Demultiplex thread up to 10 seconds to | 96 | /* Give Demultiplex thread up to 10 seconds to |
96 | reconnect, should be greater than cifs socket | 97 | reconnect, should be greater than cifs socket |
@@ -185,7 +186,8 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, | |||
185 | check for tcp and smb session status done differently | 186 | check for tcp and smb session status done differently |
186 | for those three - in the calling routine */ | 187 | for those three - in the calling routine */ |
187 | if(tcon) { | 188 | if(tcon) { |
188 | if((tcon->ses) && (tcon->ses->server)){ | 189 | if((tcon->ses) && (tcon->ses->status != CifsExiting) && |
190 | (tcon->ses->server)){ | ||
189 | struct nls_table *nls_codepage; | 191 | struct nls_table *nls_codepage; |
190 | /* Give Demultiplex thread up to 10 seconds to | 192 | /* Give Demultiplex thread up to 10 seconds to |
191 | reconnect, should be greater than cifs socket | 193 | reconnect, should be greater than cifs socket |