Commit e7660f1c authored by Nathan Scott's avatar Nathan Scott

[XFS] Ensure we update the wbc pages skipped count correctly when

writing pages.

SGI Modid: xfs-linux:xfs-kern:179566a
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent f5a9368f
...@@ -550,6 +550,7 @@ xfs_map_unwritten( ...@@ -550,6 +550,7 @@ xfs_map_unwritten(
STATIC void STATIC void
xfs_submit_page( xfs_submit_page(
struct page *page, struct page *page,
struct writeback_control *wbc,
struct buffer_head *bh_arr[], struct buffer_head *bh_arr[],
int cnt) int cnt)
{ {
...@@ -573,8 +574,10 @@ xfs_submit_page( ...@@ -573,8 +574,10 @@ xfs_submit_page(
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
submit_bh(WRITE, bh_arr[i]); submit_bh(WRITE, bh_arr[i]);
} else } else {
end_page_writeback(page); end_page_writeback(page);
wbc->pages_skipped++; /* We didn't write this page */
}
} }
/* /*
...@@ -652,7 +655,7 @@ xfs_convert_page( ...@@ -652,7 +655,7 @@ xfs_convert_page(
if (startio) { if (startio) {
wbc->nr_to_write--; wbc->nr_to_write--;
xfs_submit_page(page, bh_arr, index); xfs_submit_page(page, wbc, bh_arr, index);
} else { } else {
unlock_page(page); unlock_page(page);
} }
...@@ -864,7 +867,7 @@ xfs_page_state_convert( ...@@ -864,7 +867,7 @@ xfs_page_state_convert(
SetPageUptodate(page); SetPageUptodate(page);
if (startio) if (startio)
xfs_submit_page(page, bh_arr, cnt); xfs_submit_page(page, wbc, bh_arr, cnt);
if (iomp) { if (iomp) {
tlast = (iomp->iomap_offset + iomp->iomap_bsize - 1) >> tlast = (iomp->iomap_offset + iomp->iomap_bsize - 1) >>
......
Markdown is supported
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