diff options
| author | David Howells <dhowells@redhat.com> | 2017-03-16 19:27:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 12:07:25 +0300 |
| commit | d43dda072544ecf7890eab6a920fb602c9aafa63 (patch) | |
| tree | c877a5b9c4660f9eb555efc82960beb044cfa1c7 /fs/afs | |
| parent | 856bb4b609ee1cac2a5c74a30c40ad82e782dabf (diff) | |
| download | linux-d43dda072544ecf7890eab6a920fb602c9aafa63.tar.xz | |
afs: Fix afs_kill_pages()
[ Upstream commit 7286a35e893176169b09715096a4aca557e2ccd2 ]
Fix afs_kill_pages() in two ways:
(1) If a writeback has been partially flushed, then if we try and kill the
pages it contains, some of them may no longer be undergoing writeback
and end_page_writeback() will assert.
Fix this by checking to see whether the page in question is actually
undergoing writeback before ending that writeback.
(2) The loop that scans for pages to kill doesn't increase the first page
index, and so the loop may not terminate, but it will try to process
the same pages over and over again.
Fix this by increasing the first page index to one after the last page
we processed.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/write.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index f9e5994e80ab..3fba2b573c86 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -299,10 +299,14 @@ static void afs_kill_pages(struct afs_vnode *vnode, bool error, ASSERTCMP(pv.nr, ==, count); for (loop = 0; loop < count; loop++) { - ClearPageUptodate(pv.pages[loop]); + struct page *page = pv.pages[loop]; + ClearPageUptodate(page); if (error) - SetPageError(pv.pages[loop]); - end_page_writeback(pv.pages[loop]); + SetPageError(page); + if (PageWriteback(page)) + end_page_writeback(page); + if (page->index >= first) + first = page->index + 1; } __pagevec_release(&pv); |