Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753840AbdCHQmJ (ORCPT ); Wed, 8 Mar 2017 11:42:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50970 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753831AbdCHQmE (ORCPT ); Wed, 8 Mar 2017 11:42:04 -0500 From: Jeff Layton To: viro@zeniv.linux.org.uk, akpm@linux-foundation.org Cc: konishi.ryusuke@lab.ntt.co.jp, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-nilfs@vger.kernel.org, ross.zwisler@linux.intel.com, jack@suse.cz, neilb@suse.com, openosd@gmail.com, adilger@dilger.ca, James.Bottomley@HansenPartnership.com Subject: [PATCH v2 3/9] mm: clear any AS_* errors when returning error on any fsync or close Date: Wed, 8 Mar 2017 11:29:28 -0500 Message-Id: <20170308162934.21989-4-jlayton@redhat.com> In-Reply-To: <20170308162934.21989-1-jlayton@redhat.com> References: <20170308162934.21989-1-jlayton@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 08 Mar 2017 16:30:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2149 Lines: 66 Currently we don't clear the address space error when there is a -EIO error on fsynci, due to writeback initiation failure. If writes fail with -EIO and the mapping is flagged with an AS_EIO or AS_ENOSPC error, then we can end up returning errors on two fsync calls, even when a write between them succeeded (or there was no write). Ensure that we also clear out any mapping errors when initiating writeback fails with -EIO in filemap_write_and_wait and filemap_write_and_wait_range. Suggested-by: Jan Kara Signed-off-by: Jeff Layton --- mm/filemap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1694623a6289..fc123b9833e1 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -488,7 +488,7 @@ EXPORT_SYMBOL(filemap_fdatawait); int filemap_write_and_wait(struct address_space *mapping) { - int err = 0; + int err; if ((!dax_mapping(mapping) && mapping->nrpages) || (dax_mapping(mapping) && mapping->nrexceptional)) { @@ -499,10 +499,18 @@ int filemap_write_and_wait(struct address_space *mapping) * But the -EIO is special case, it may indicate the worst * thing (e.g. bug) happened, so we avoid waiting for it. */ - if (err != -EIO) { + if (likely(err != -EIO)) { int err2 = filemap_fdatawait(mapping); if (!err) err = err2; + } else { + /* + * Clear the error in the address space since we're + * returning an error here. -EIO takes precedence over + * everything else though, so we can just discard + * the return here. + */ + filemap_check_errors(mapping); } } else { err = filemap_check_errors(mapping); @@ -537,6 +545,14 @@ int filemap_write_and_wait_range(struct address_space *mapping, lstart, lend); if (!err) err = err2; + } else { + /* + * Clear the error in the address space since we're + * returning an error here. -EIO takes precedence over + * everything else though, so we can just discard + * the return here. + */ + filemap_check_errors(mapping); } } else { err = filemap_check_errors(mapping); -- 2.9.3