From: Pavel Shilovsky Date: Thu, 2 Oct 2014 16:13:35 +0000 (+0400) Subject: CIFS: Fix readpages retrying on reconnects X-Git-Tag: firefly_0821_release~176^2~3150^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1209bbdff2f6bbffa6eb5823033bbd7b8799a5e2;p=firefly-linux-kernel-4.4.55.git CIFS: Fix readpages retrying on reconnects If we got a reconnect error from async readv we re-add pages back to page_list and continue loop. That is wrong because these pages have been already added to the pagecache but page_list has pages that have not been added to the pagecache yet. This ends up with a general protection fault in put_pages after readpages. Fix it by not retrying the read of these pages and falling back to readpage instead. Fixes debian bug 762306 Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French Tested-by: Arthur Marsh --- diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 7c018a1c52f7..5f29354b072a 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; }