Subject: + fs-mpagec-factor-page_endio-out-of-mpage_end_io.patch added to -mm tree
To: matthew.r.wilcox@xxxxxxxxx,david@xxxxxxxxxxxxx,dheeraj.reddy@xxxxxxxxx,hughd@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 24 Apr 2014 11:17:59 -0700
The patch titled
Subject: fs/mpage.c: factor page_endio() out of mpage_end_io()
has been added to the -mm tree. Its filename is
fs-mpagec-factor-page_endio-out-of-mpage_end_io.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-mpagec-factor-page_endio-out-of-mpage_end_io.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-mpagec-factor-page_endio-out-of-mpage_end_io.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx>
Subject: fs/mpage.c: factor page_endio() out of mpage_end_io()
page_endio() takes care of updating all the appropriate page flags once
I/O has finished to a page. Switch to using mapping_set_error() instead
of setting AS_EIO directly; this will handle thin-provisioned devices
correctly.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Dheeraj Reddy <dheeraj.reddy@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/mpage.c | 18 +-----------------
include/linux/pagemap.h | 2 ++
mm/filemap.c | 25 +++++++++++++++++++++++++
3 files changed, 28 insertions(+), 17 deletions(-)
diff -puN fs/mpage.c~fs-mpagec-factor-page_endio-out-of-mpage_end_io fs/mpage.c
--- a/fs/mpage.c~fs-mpagec-factor-page_endio-out-of-mpage_end_io
+++ a/fs/mpage.c
@@ -48,23 +48,7 @@ static void mpage_end_io(struct bio *bio
bio_for_each_segment_all(bv, bio, i) {
struct page *page = bv->bv_page;
-
- if (bio_data_dir(bio) == READ) {
- if (!err) {
- SetPageUptodate(page);
- } else {
- ClearPageUptodate(page);
- SetPageError(page);
- }
- unlock_page(page);
- } else { /* bio_data_dir(bio) == WRITE */
- if (err) {
- SetPageError(page);
- if (page->mapping)
- set_bit(AS_EIO, &page->mapping->flags);
- }
- end_page_writeback(page);
- }
+ page_endio(page, bio_data_dir(bio), err);
}
bio_put(bio);
diff -puN include/linux/pagemap.h~fs-mpagec-factor-page_endio-out-of-mpage_end_io include/linux/pagemap.h
--- a/include/linux/pagemap.h~fs-mpagec-factor-page_endio-out-of-mpage_end_io
+++ a/include/linux/pagemap.h
@@ -453,6 +453,8 @@ static inline void wait_on_page_writebac
extern void end_page_writeback(struct page *page);
void wait_for_stable_page(struct page *page);
+void page_endio(struct page *page, int rw, int err);
+
/*
* Add an arbitrary waiter to a page's wait queue
*/
diff -puN mm/filemap.c~fs-mpagec-factor-page_endio-out-of-mpage_end_io mm/filemap.c
--- a/mm/filemap.c~fs-mpagec-factor-page_endio-out-of-mpage_end_io
+++ a/mm/filemap.c
@@ -762,6 +762,31 @@ void end_page_writeback(struct page *pag
}
EXPORT_SYMBOL(end_page_writeback);
+/*
+ * After completing I/O on a page, call this routine to update the page
+ * flags appropriately
+ */
+void page_endio(struct page *page, int rw, int err)
+{
+ if (rw == READ) {
+ if (!err) {
+ SetPageUptodate(page);
+ } else {
+ ClearPageUptodate(page);
+ SetPageError(page);
+ }
+ unlock_page(page);
+ } else { /* rw == WRITE */
+ if (err) {
+ SetPageError(page);
+ if (page->mapping)
+ mapping_set_error(page->mapping, err);
+ }
+ end_page_writeback(page);
+ }
+}
+EXPORT_SYMBOL_GPL(page_endio);
+
/**
* __lock_page - get a lock on the page, assuming we need to sleep to get it
* @page: the page to lock
_
Patches currently in -mm which might be from matthew.r.wilcox@xxxxxxxxx are
origin.patch
mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch
fs-bufferc-remove-block_write_full_page_endio.patch
fs-mpagec-factor-clean_buffers-out-of-__mpage_writepage.patch
fs-mpagec-factor-page_endio-out-of-mpage_end_io.patch
fs-block_devc-add-bdev_read_page-and-bdev_write_page.patch
swap-use-bdev_read_page-bdev_write_page.patch
brd-add-support-for-rw_page.patch
brd-return-enospc-rather-than-enomem-on-page-allocation-failure.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
