[PATCH 22/27] afs: Don't set PG_error on local EINTR or ENOMEM when filling a page

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	David Howells <dhowells@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH 22/27] afs: Don't set PG_error on local EINTR or ENOMEM when filling a page
Date	Thu, 09 Mar 2017 20:00:04 +0100
Message-ID	<tjbs8-I0-81@gated-at.bofh.it> (permalink)
References	<tjbs6-I0-7@gated-at.bofh.it>
Organization	Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903
User-Agent	StGit/0.17.1-dirty
MIME-Version	1.0
Content-Type	text/plain; charset="utf-8"
Content-Transfer-Encoding	7bit
X-Scanned-By	MIMEDefang 2.74 on 10.5.11.28
X-Greylist	Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 09 Mar 2017 18:58:23 +0000 (UTC)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	42
X-Original-Cc	dhowells@redhat.com, linux-fsdevel@vger.kernel.org, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org
X-Original-Date	Thu, 09 Mar 2017 18:58:21 +0000
X-Original-Message-ID	<148908590096.16794.14306980439263490406.stgit@warthog.procyon.org.uk>
X-Original-References	<148908574888.16794.14109877851518811944.stgit@warthog.procyon.org.uk>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1596340

Show key headers only | View raw

Don't set PG_error on a page if we get local EINTR or ENOMEM when filling a
page for writing.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/afs/file.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fs/afs/file.c b/fs/afs/file.c
index b5829443ff69..0d5b8508869b 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -212,7 +212,13 @@ int afs_page_filler(void *data, struct page *page)
 			fscache_uncache_page(vnode->cache, page);
 #endif
 			BUG_ON(PageFsCache(page));
-			goto error;
+
+			if (ret == -EINTR ||
+			    ret == -ENOMEM ||
+			    ret == -ERESTARTSYS ||
+			    ret == -EAGAIN)
+				goto error;
+			goto io_error;
 		}
 
 		SetPageUptodate(page);
@@ -231,10 +237,12 @@ int afs_page_filler(void *data, struct page *page)
 	_leave(" = 0");
 	return 0;
 
+io_error:
+	SetPageError(page);
+	goto error;
 enomem:
 	ret = -ENOMEM;
 error:
-	SetPageError(page);
 	unlock_page(page);
 	_leave(" = %d", ret);
 	return ret;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 22/27] afs: Don't set PG_error on local EINTR or ENOMEM when  filling a page David Howells <dhowells@redhat.com> - 2017-03-09 20:00 +0100

csiph-web