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/file.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/file.c')
| -rw-r--r-- | fs/cifs/file.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 7c018a1..5f29354 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3568,15 +3568,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, lru_cache_add_file(page); unlock_page(page); page_cache_release(page); - 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); - continue; - } break; } |
