diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-11-18 16:33:48 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-11-18 16:33:48 +0000 |
| commit | bfb59820ee46616a7bdb4af6b8f7e109646de6ec (patch) | |
| tree | e2a62482c9094102aff08f621e000c55c1391858 /fs | |
| parent | 4e14e833ac3b97a4aa8803eea49f899adc5bb5f4 (diff) | |
| download | linux-3.10-bfb59820ee46616a7bdb4af6b8f7e109646de6ec.tar.gz linux-3.10-bfb59820ee46616a7bdb4af6b8f7e109646de6ec.tar.bz2 linux-3.10-bfb59820ee46616a7bdb4af6b8f7e109646de6ec.zip | |
[CIFS] fix check for dead tcon in smb_init
This was recently changed to check for need_reconnect, but should
actually be a check for a tidStatus of CifsExiting.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/CHANGES | 6 | ||||
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 8855331b2fb..e078b7aea14 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES @@ -8,7 +8,11 @@ handling fcntl(F_SETLEASE). Convert cifs to using blocking tcp sends, and also let tcp autotune the socket send and receive buffers. This reduces the number of EAGAIN errors returned by TCP/IP in high stress workloads (and the number of retries on socket writes -when sending large SMBWriteX requests). +when sending large SMBWriteX requests). Fix case in which a portion of +data can in some cases not get written to the file on the server before the +file is closed. Fix DFS parsing to properly handle path consumed field, +and to handle certain codepage conversions better. Fix mount and +umount race that can cause oops in mount or umount or reconnect. Version 1.54 ------------ diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index bdda46dd435..2af8626ced4 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -295,7 +295,7 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, check for tcp and smb session status done differently for those three - in the calling routine */ if (tcon) { - if (tcon->need_reconnect) { + if (tcon->tidStatus == CifsExiting) { /* only tree disconnect, open, and write, (and ulogoff which does not have tcon) are allowed as we start force umount */ |