From 176f207b2352a979b3740fa61460403336edf31a Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 25 Jun 2009 00:29:21 +0000 Subject: [PATCH] --- yaml --- r: 154369 b: refs/heads/master c: 268875b9d1dd1bf0b523c59e736da9bc20c8ce1f h: refs/heads/master i: 154367: 07a40233bfcdaedb1435dc7318105717ee00abe7 v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 2 +- trunk/fs/cifs/cifssmb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eeb861048c1d..de367b8f8b85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 361ea1ae5451040cd254eee0b6df64581080b2cc +refs/heads/master: 268875b9d1dd1bf0b523c59e736da9bc20c8ce1f diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index b48689839428..3a9b7a58a51d 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/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/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index b84c61d5bca4..58d65a9a79c3 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/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,