From: Jeff Layton <jlayton@redhat.com> To: Andrew Morton <akpm@linux-foundation.org>, Al Viro <viro@ZenIV.linux.org.uk>, Jan Kara <jack@suse.cz>, tytso@mit.edu, axboe@kernel.dk, mawilcox@microsoft.com, ross.zwisler@linux.intel.com, corbet@lwn.net, Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>, David Sterba <dsterba@suse.com>, "Darrick J . Wong" <darrick.wong@oracle.com> Cc: Carlos Maiolino <cmaiolino@redhat.com>, Eryu Guan <eguan@redhat.com>, David Howells <dhowells@redhat.com>, Christoph Hellwig <hch@infradead.org>, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v7 08/22] mm: clean up error handling in write_one_page Date: Fri, 16 Jun 2017 15:34:13 -0400 [thread overview] Message-ID: <20170616193427.13955-9-jlayton@redhat.com> (raw) In-Reply-To: <20170616193427.13955-1-jlayton@redhat.com> Don't try to check PageError since that's potentially racy and not necessarily going to be set after writepage errors out. Instead, check the mapping for an error after writepage returns. Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Jan Kara <jack@suse.cz> --- mm/page-writeback.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 36c62fda96bc..64b75bd996a4 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2371,14 +2371,13 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) * * The page must be locked by the caller and will be unlocked upon return. * - * write_one_page() returns a negative error code if I/O failed. Note that - * the address_space is not marked for error. The caller must do this if - * needed. + * Note that the mapping's AS_EIO/AS_ENOSPC flags will be cleared when this + * function returns. */ int write_one_page(struct page *page) { struct address_space *mapping = page->mapping; - int ret = 0; + int ret = 0, ret2; struct writeback_control wbc = { .sync_mode = WB_SYNC_ALL, .nr_to_write = 1, @@ -2391,15 +2390,15 @@ int write_one_page(struct page *page) if (clear_page_dirty_for_io(page)) { get_page(page); ret = mapping->a_ops->writepage(page, &wbc); - if (ret == 0) { + if (ret == 0) wait_on_page_writeback(page); - if (PageError(page)) - ret = -EIO; - } put_page(page); } else { unlock_page(page); } + + if (!ret) + ret = filemap_check_errors(mapping); return ret; } EXPORT_SYMBOL(write_one_page); -- 2.13.0
WARNING: multiple messages have this Message-ID (diff)
From: Jeff Layton <jlayton@redhat.com> To: Andrew Morton <akpm@linux-foundation.org>, Al Viro <viro@ZenIV.linux.org.uk>, Jan Kara <jack@suse.cz>, tytso@mit.edu, axboe@kernel.dk, mawilcox@microsoft.com, ross.zwisler@linux.intel.com, corbet@lwn.net, Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>, David Sterba <dsterba@suse.com>, "Darrick J . Wong" <darrick.wong@oracle.com> Cc: Carlos Maiolino <cmaiolino@redhat.com>, Eryu Guan <eguan@redhat.com>, David Howells <dhowells@redhat.com>, Christoph Hellwig <hch@infradead.org>, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v7 08/22] mm: clean up error handling in write_one_page Date: Fri, 16 Jun 2017 15:34:13 -0400 [thread overview] Message-ID: <20170616193427.13955-9-jlayton@redhat.com> (raw) In-Reply-To: <20170616193427.13955-1-jlayton@redhat.com> Don't try to check PageError since that's potentially racy and not necessarily going to be set after writepage errors out. Instead, check the mapping for an error after writepage returns. Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Jan Kara <jack@suse.cz> --- mm/page-writeback.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 36c62fda96bc..64b75bd996a4 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2371,14 +2371,13 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) * * The page must be locked by the caller and will be unlocked upon return. * - * write_one_page() returns a negative error code if I/O failed. Note that - * the address_space is not marked for error. The caller must do this if - * needed. + * Note that the mapping's AS_EIO/AS_ENOSPC flags will be cleared when this + * function returns. */ int write_one_page(struct page *page) { struct address_space *mapping = page->mapping; - int ret = 0; + int ret = 0, ret2; struct writeback_control wbc = { .sync_mode = WB_SYNC_ALL, .nr_to_write = 1, @@ -2391,15 +2390,15 @@ int write_one_page(struct page *page) if (clear_page_dirty_for_io(page)) { get_page(page); ret = mapping->a_ops->writepage(page, &wbc); - if (ret == 0) { + if (ret == 0) wait_on_page_writeback(page); - if (PageError(page)) - ret = -EIO; - } put_page(page); } else { unlock_page(page); } + + if (!ret) + ret = filemap_check_errors(mapping); return ret; } EXPORT_SYMBOL(write_one_page); -- 2.13.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-06-16 19:34 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-16 19:34 [PATCH v7 00/22] fs: enhanced writeback error reporting with errseq_t (pile #1) Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 01/22] fs: remove call_fsync helper function Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-20 12:31 ` Christoph Hellwig 2017-06-20 12:31 ` Christoph Hellwig 2017-06-20 15:33 ` Jan Kara 2017-06-20 15:33 ` Jan Kara 2017-06-26 8:05 ` Carlos Maiolino 2017-06-26 8:05 ` Carlos Maiolino 2017-06-16 19:34 ` [PATCH v7 02/22] buffer: use mapping_set_error instead of setting the flag Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 03/22] fs: check for writeback errors after syncing out buffers in generic_file_fsync Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 04/22] buffer: set errors in mapping at the time that the error occurs Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-26 8:19 ` Carlos Maiolino 2017-06-26 8:19 ` Carlos Maiolino 2017-06-16 19:34 ` [PATCH v7 05/22] jbd2: don't clear and reset errors after waiting on writeback Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-20 15:32 ` Jan Kara 2017-06-20 15:32 ` Jan Kara 2017-06-26 8:23 ` Carlos Maiolino 2017-06-26 8:23 ` Carlos Maiolino 2017-06-16 19:34 ` [PATCH v7 06/22] mm: clear AS_EIO/AS_ENOSPC when writeback initiation fails Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 07/22] mm: don't TestClearPageError in __filemap_fdatawait_range Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` Jeff Layton [this message] 2017-06-16 19:34 ` [PATCH v7 08/22] mm: clean up error handling in write_one_page Jeff Layton 2017-06-16 19:34 ` [PATCH v7 09/22] fs: always sync metadata in __generic_file_fsync Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 10/22] lib: add errseq_t type and infrastructure for handling it Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 11/22] fs: new infrastructure for writeback error handling and reporting Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-20 12:34 ` Christoph Hellwig 2017-06-20 12:34 ` Christoph Hellwig 2017-06-20 12:56 ` Jeff Layton 2017-06-20 12:56 ` Jeff Layton 2017-06-20 12:56 ` Jeff Layton 2017-06-20 12:56 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 12/22] mm: tracepoints for writeback error events Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 13/22] mm: set both AS_EIO/AS_ENOSPC and errseq_t in mapping_set_error Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 14/22] Documentation: flesh out the section in vfs.txt on storing and reporting writeback errors Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 15/22] dax: set errors in mapping when writeback fails Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-17 12:39 ` Jeff Layton 2017-06-17 12:39 ` Jeff Layton 2017-06-17 12:39 ` Jeff Layton 2017-06-17 12:39 ` Jeff Layton 2017-06-19 17:48 ` Ross Zwisler 2017-06-19 17:48 ` Ross Zwisler 2017-06-16 19:34 ` [PATCH v7 16/22] block: convert to errseq_t based writeback error tracking Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-20 12:35 ` Christoph Hellwig 2017-06-20 12:35 ` Christoph Hellwig 2017-06-20 17:44 ` Jeff Layton 2017-06-20 17:44 ` Jeff Layton 2017-06-20 17:44 ` Jeff Layton 2017-06-20 17:44 ` Jeff Layton 2017-06-24 11:59 ` Christoph Hellwig 2017-06-24 11:59 ` Christoph Hellwig 2017-06-24 13:16 ` Jeff Layton 2017-06-24 13:16 ` Jeff Layton 2017-06-24 13:16 ` Jeff Layton 2017-06-24 13:16 ` Jeff Layton 2017-06-26 14:34 ` Jeff Layton 2017-06-26 14:34 ` Jeff Layton 2017-06-26 14:34 ` Jeff Layton 2017-06-26 14:34 ` Jeff Layton 2017-06-27 15:20 ` Christoph Hellwig 2017-06-27 15:20 ` Christoph Hellwig 2017-06-16 19:34 ` [PATCH v7 17/22] ext4: use errseq_t based error handling for reporting data writeback errors Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 18/22] fs: add f_md_wb_err field to struct file for tracking metadata errors Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 19/22] ext4: add more robust reporting of metadata writeback errors Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 20/22] ext2: convert to errseq_t based writeback error tracking Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-16 19:34 ` [PATCH v7 21/22] xfs: minimal conversion to errseq_t writeback error reporting Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-26 13:40 ` Carlos Maiolino 2017-06-26 13:40 ` Carlos Maiolino 2017-06-26 15:22 ` Darrick J. Wong 2017-06-26 15:22 ` Darrick J. Wong 2017-06-26 17:58 ` jlayton 2017-06-26 17:58 ` jlayton 2017-06-26 17:58 ` jlayton 2017-06-26 17:58 ` jlayton 2017-06-26 18:10 ` Darrick J. Wong 2017-06-26 18:10 ` Darrick J. Wong 2017-06-16 19:34 ` [PATCH v7 22/22] btrfs: minimal conversion to errseq_t writeback error reporting on fsync Jeff Layton 2017-06-16 19:34 ` Jeff Layton 2017-06-19 16:23 ` [PATCH v7 00/22] fs: enhanced writeback error reporting with errseq_t (pile #1) Jeff Layton 2017-06-19 16:23 ` Jeff Layton 2017-06-19 16:23 ` Jeff Layton 2017-06-19 16:23 ` Jeff Layton 2017-06-19 23:25 ` Stephen Rothwell 2017-06-19 23:25 ` Stephen Rothwell 2017-06-20 10:16 ` Jeff Layton 2017-06-20 10:16 ` Jeff Layton 2017-06-20 10:16 ` Jeff Layton 2017-06-20 10:16 ` Jeff Layton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170616193427.13955-9-jlayton@redhat.com \ --to=jlayton@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=axboe@kernel.dk \ --cc=clm@fb.com \ --cc=cmaiolino@redhat.com \ --cc=corbet@lwn.net \ --cc=darrick.wong@oracle.com \ --cc=dhowells@redhat.com \ --cc=dsterba@suse.com \ --cc=eguan@redhat.com \ --cc=hch@infradead.org \ --cc=jack@suse.cz \ --cc=jbacik@fb.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-xfs@vger.kernel.org \ --cc=mawilcox@microsoft.com \ --cc=ross.zwisler@linux.intel.com \ --cc=tytso@mit.edu \ --cc=viro@ZenIV.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.