Commit 7d1419f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://

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://
  CIFS: Fix readpages retrying on reconnects
  Fix problem recognizing symlinks
parents ee042ec8 1209bbdf
......@@ -3568,15 +3568,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
if (rc == -EAGAIN)
list_add_tail(&page->lru, &tmplist);
/* Fallback to the readpage in error/reconnect cases */
kref_put(&rdata->refcount, cifs_readdata_release);
if (rc == -EAGAIN) {
/* Re-add pages to the page_list and retry */
list_splice(&tmplist, page_list);
......@@ -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 if (tmprc == 0)
CIFSSMBClose(xid, tcon, fid.netfid);
......@@ -256,6 +256,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment