linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Wysochanski <dwysocha@redhat.com>
To: Trond Myklebust <trondmy@hammerspace.com>,
	Anna Schumaker <anna.schumaker@netapp.com>,
	David Howells <dhowells@redhat.com>
Cc: linux-cachefs@redhat.com, linux-nfs@vger.kernel.org
Subject: [PATCH v1 1/7] NFS: Fixup patch 3/8 of fscache-iter-3 v2
Date: Sun,  3 Oct 2021 15:22:32 -0400	[thread overview]
Message-ID: <1633288958-8481-2-git-send-email-dwysocha@redhat.com> (raw)
In-Reply-To: <1633288958-8481-1-git-send-email-dwysocha@redhat.com>

Handle failed return values of fscache_fallback_read_page() in
switch statement.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
---
 fs/nfs/fscache.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
index 5b0e78742444..d3efb8ba4fb7 100644
--- a/fs/nfs/fscache.c
+++ b/fs/nfs/fscache.c
@@ -345,11 +345,6 @@ int __nfs_readpage_from_fscache(struct inode *inode, struct page *page)
 	}
 
 	ret = fscache_fallback_read_page(nfs_i_fscache(inode), page);
-	if (ret < 0) {
-		dfprintk(FSCACHE, "NFS:    readpage_from_fscache: "
-			 "fscache_fallback_read_page failed ret = %d\n", ret);
-		return ret;
-	}
 
 	switch (ret) {
 	case 0: /* Read completed synchronously */
@@ -363,7 +358,7 @@ int __nfs_readpage_from_fscache(struct inode *inode, struct page *page)
 	case -ENODATA: /* page not in cache */
 		nfs_inc_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_FAIL);
 		dfprintk(FSCACHE,
-			 "NFS:    readpage_from_fscache %d\n", ret);
+			 "NFS:    readpage_from_fscache failed %d\n", ret);
 		SetPageChecked(page);
 		return 1;
 
-- 
1.8.3.1


  reply	other threads:[~2021-10-03 19:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-03 19:22 [PATCH v1 0/7] Various NFS fscache cleanups Dave Wysochanski
2021-10-03 19:22 ` Dave Wysochanski [this message]
2021-10-03 19:22 ` [PATCH v1 2/7] NFS: Use nfs_i_fscache() consistently within NFS fscache code Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 3/7] NFS: Cleanup usage of nfs_inode in fscache interface and handle i_size properly Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 4/7] NFS: Convert NFS fscache enable/disable dfprintks to tracepoints Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 5/7] NFS: Replace dfprintks in favor of tracepoints in fscache IO paths Dave Wysochanski
2021-10-07 13:41   ` [Linux-cachefs] " David Wysochanski
2021-10-03 19:22 ` [PATCH v1 6/7] NFS: Remove remaining dfprintks related to fscache cookies Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 7/7] NFS: Remove remaining usages of NFSDBG_FSCACHE Dave Wysochanski
2021-10-04 15:57   ` Trond Myklebust
2021-10-05 13:51     ` David Wysochanski
2021-10-05  9:52 ` [PATCH v1 0/7] Various NFS fscache cleanups David Howells
2021-10-05 12:31 ` David Howells
2021-10-05 12:52 ` [PATCH v1 1/7] NFS: Fixup patch 3/8 of fscache-iter-3 v2 David Howells
2021-10-05 13:23   ` David Wysochanski

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=1633288958-8481-2-git-send-email-dwysocha@redhat.com \
    --to=dwysocha@redhat.com \
    --cc=anna.schumaker@netapp.com \
    --cc=dhowells@redhat.com \
    --cc=linux-cachefs@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trondmy@hammerspace.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).