diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 13:09:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 13:09:57 -0700 |
commit | 7d1419f30cc5106196e54a282d7e115e698c95f6 (patch) | |
tree | 55ae51e8817e674e929a395f1c99c072ebba942f /fs/cifs/smb1ops.c | |
parent | ee042ec88022249b848306dd6e87ffd2fd88a839 (diff) | |
parent | 1209bbdff2f6bbffa6eb5823033bbd7b8799a5e2 (diff) | |
download | op-kernel-dev-7d1419f30cc5106196e54a282d7e115e698c95f6.zip op-kernel-dev-7d1419f30cc5106196e54a282d7e115e698c95f6.tar.gz |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs/smb3 fixes from Steve French:
"Fix for CIFS/SMB3 oops on reconnect during readpages (3.17 regression)
and for incorrectly closing file handle in symlink error cases"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix readpages retrying on reconnects
Fix problem recognizing symlinks
Diffstat (limited to 'fs/cifs/smb1ops.c')
-rw-r--r-- | fs/cifs/smb1ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 1a6df4b..52131d8 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -586,7 +586,7 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, tmprc = CIFS_open(xid, &oparms, &oplock, NULL); if (tmprc == -EOPNOTSUPP) *symlink = true; - else + else if (tmprc == 0) CIFSSMBClose(xid, tcon, fid.netfid); } |