diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-25 00:29:21 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-25 00:29:21 +0000 |
| commit | 268875b9d1dd1bf0b523c59e736da9bc20c8ce1f (patch) | |
| tree | 9d2a55c5847aadfbfc1c50617dc469dd40716900 /fs/cifs | |
| parent | 361ea1ae5451040cd254eee0b6df64581080b2cc (diff) | |
| download | linux-3.10-268875b9d1dd1bf0b523c59e736da9bc20c8ce1f.tar.gz linux-3.10-268875b9d1dd1bf0b523c59e736da9bc20c8ce1f.tar.bz2 linux-3.10-268875b9d1dd1bf0b523c59e736da9bc20c8ce1f.zip | |
[CIFS] Do not send tree disconnect if session is already disconnected
Noticed this when tree connect timed out (due to Samba server crash) -
we try to send a tree disconnect for a tid that does not exist
since we don't have a valid tree id yet. This checks that the
session is valid before sending the tree disconnect to handle
this case.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/CHANGES | 2 | ||||
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index b4868983942..3a9b7a58a51 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES @@ -5,7 +5,7 @@ client generated ones by default (mount option "serverino" turned on by default if server supports it). Add forceuid and forcegid mount options (so that when negotiating unix extensions specifying which uid mounted does not immediately force the server's reported -uids to be overridden). +uids to be overridden). Add support for scope moutn parm. Version 1.58 ------------ diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index b84c61d5bca..58d65a9a79c 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -729,7 +729,7 @@ CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon) * the tcon is no longer on the list, so no need to take lock before * checking this. */ - if (tcon->need_reconnect) + if ((tcon->need_reconnect) || (tcon->ses->need_reconnect)) return 0; rc = small_smb_init(SMB_COM_TREE_DISCONNECT, 0, tcon, |