From: Fred Isaman <iisaman@xxxxxxxxxxxxxx>
Communicate between nfs_readpages and nfs_readpage any pnfs failures,
so that nfs_readpage can immediately default to mds.
Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxxxxxx>
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
fs/nfs/blocklayout/blocklayout.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 22ea965..99de9e3 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -151,10 +151,12 @@ static inline void
bl_done_with_rpage(struct page *page, const int ok)
{
if (ok) {
+ ClearPagePnfsErr(page);
SetPageUptodate(page);
} else {
ClearPageUptodate(page);
SetPageError(page);
+ SetPagePnfsErr(page);
}
/* Page is unlocked via rpc_release. Should really be done here. */
}
@@ -227,6 +229,13 @@ bl_read_pagelist(struct pnfs_layout_type *lo,
dprintk("%s dont_like_caller failed\n", __func__);
goto use_mds;
}
+ if ((nr_pages == 1) && PagePnfsErr(rdata->req->wb_page)) {
+ /* We want to fall back to mds in case of read_page
+ * after error on read_pages.
+ */
+ dprintk("%s PG_pnfserr set\n", __func__);
+ goto use_mds;
+ }
par = alloc_parallel(rdata);
if (!par)
goto use_mds;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
