From patchwork Thu Jun 4 15:04:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 6547751 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C77749F1CC for ; Thu, 4 Jun 2015 15:14:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B80B20767 for ; Thu, 4 Jun 2015 15:14:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E506020766 for ; Thu, 4 Jun 2015 15:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752773AbbFDPOi (ORCPT ); Thu, 4 Jun 2015 11:14:38 -0400 Received: from nautica.notk.org ([91.121.71.147]:33418 "EHLO nautica.notk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752330AbbFDPOh (ORCPT ); Thu, 4 Jun 2015 11:14:37 -0400 X-Greylist: delayed 602 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 Jun 2015 11:14:37 EDT Received: by nautica.notk.org (Postfix, from userid 1001) id B42FFC009; Thu, 4 Jun 2015 17:04:34 +0200 (CEST) From: Dominique Martinet To: linux-nfs@vger.kernel.org, Anna Schumaker , Trond Myklebust Cc: linux-kernel@vger.kernel.org, Dominique Martinet , "Frank S. Filz" Subject: [PATCH] NFSv4: handle nfs4_get_referral failure Date: Thu, 4 Jun 2015 17:04:17 +0200 Message-Id: <1433430257-11894-1-git-send-email-dominique.martinet@cea.fr> X-Mailer: git-send-email 1.7.10.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP nfs4_proc_lookup_common is supposed to return a posix error, we have to handle any error returned that isn't errno Reported-by: Olga Kornievskaia Signed-off-by: Frank S. Filz Signed-off-by: Dominique Martinet --- Other way of fixing it would be to return something like -EIO directly in nfs4_get_referral, but I believe handling exception is the right thing to do. Only other return code atm is -ENOMEM which probably isn't recoverable? fs/nfs/nfs4proc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 627f37c..e7fbf24 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3356,6 +3356,8 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir, goto out; case -NFS4ERR_MOVED: err = nfs4_get_referral(client, dir, name, fattr, fhandle); + if (err == -NFS4ERR_MOVED) + err = nfs4_handle_exception(NFS_SERVER(dir), err, &exception); goto out; case -NFS4ERR_WRONGSEC: err = -EPERM;