From patchwork Tue Jun 7 17:29:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858192 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p57HShV9019126 for ; Tue, 7 Jun 2011 17:29:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755880Ab1FGR3H (ORCPT ); Tue, 7 Jun 2011 13:29:07 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:53598 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755865Ab1FGR3G (ORCPT ); Tue, 7 Jun 2011 13:29:06 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 4B99930852CE; Tue, 7 Jun 2011 13:29:06 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B-CuQKTq57x2; Tue, 7 Jun 2011 13:29:05 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id D498C3055B74; Tue, 7 Jun 2011 13:29:05 -0400 (EDT) Date: Tue, 7 Jun 2011 13:29:05 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 27/88] pnfsblock: read path error handling Message-ID: <8807778f044cea23cfbacbdd3d3277b906cd943f.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 17:29:08 +0000 (UTC) From: Fred Isaman Communicate between nfs_readpages and nfs_readpage any pnfs failures, so that nfs_readpage can immediately default to mds. Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy --- 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;