From patchwork Tue May 17 16:28:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9114321 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4EC0BF29F for ; Tue, 17 May 2016 16:29:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDC172011D for ; Tue, 17 May 2016 16:29:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 176902009C for ; Tue, 17 May 2016 16:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755882AbcEQQ3N (ORCPT ); Tue, 17 May 2016 12:29:13 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36645 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756202AbcEQQ3K (ORCPT ); Tue, 17 May 2016 12:29:10 -0400 Received: by mail-qk0-f195.google.com with SMTP id l68so1916216qkf.3 for ; Tue, 17 May 2016 09:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8WlEUrlZtPAyYFcZsTMtwDlcUzVlQnL/tAyyhnOzc0s=; b=znUurRSdrVGbuBanykDojZLHWWafu/Pi8WKqyf2RBNWlXvVWgmLRrNePWoDuFtA967 lXdkA+M27Gfudi1HThZEX939IybpiedWfH3tVIOc7RY8cfNRHFIJxoe46tqjiN9Hiv8p +dYYyO9L+SSW2B2SYBSKPHCfGWWo9DiBHYo3MM+OdbHnGqoqGQm82Zdrdt6YK03BIc4N ZQFAMXzI8+Bdwj1hI/bmWLRtOv6f4M8fCaRIPf6vN8dBZNNYK36orIJgHczC5brT3Giu CaxEPHHQBKVSqcJPRc5QGPcqFeggZDPv4cH1CdsbeQ/dqzCJNBJQWUa5DUgxY6fVllrF fdVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8WlEUrlZtPAyYFcZsTMtwDlcUzVlQnL/tAyyhnOzc0s=; b=Wd4wJ5QMbgqzikuWjL9fhGP7nvUnjLndMCBOdgDpiQipQSrazebn/uO62L7hVyzXo/ FX94d8H30StUmDaJ7doU/aFoV4nxEFAPZXWIJAYIQ+Hb/IG3azaBI0iA5DJVfHNz4UE0 uVqwdRihQSTODtEZEoCLyHHtckHQ3wqViZHbFEX4+vn2k78YraYzttlVTyqZYGXUwycf xbfXzIiOtsNNQbUAVA0dN0gcEj7FRkWYFRZ4Q1IVba37dEpfKYA5N7dFAIpGPt3eg9s+ 70+QBTS77BkpmyBREkAJN4JPBV1uwdMBeDMGnFIR6W0AA+1VUOObsXF5Nx+qkyEq+UjF 6J3A== X-Gm-Message-State: AOPr4FV3Sn7Thapd7ub+v/sv7TBtd4r7gSeb9w9Ss1bgDV8SbSTBoCNtLhaosHyXruggvg== X-Received: by 10.55.65.74 with SMTP id o71mr2719944qka.133.1463502549013; Tue, 17 May 2016 09:29:09 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id a31sm1685827qga.34.2016.05.17.09.29.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2016 09:29:08 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Trond Myklebust , Anna Schumaker Cc: Thomas Haynes , linux-nfs@vger.kernel.org, hch@lst.de Subject: [PATCH v4 13/13] pnfs: make pnfs_layout_process more robust Date: Tue, 17 May 2016 12:28:48 -0400 Message-Id: <1463502528-11519-14-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463502528-11519-1-git-send-email-jeff.layton@primarydata.com> References: <1463502528-11519-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 It can return NULL if layoutgets are blocked currently. Fix it to return -EAGAIN in that case, so we can properly handle it in pnfs_update_layout. Also, clean up and simplify the error handling -- eliminate "status" and just use "lseg". Signed-off-by: Jeff Layton --- fs/nfs/pnfs.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index e97895b427c0..deb609c9cd8a 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1708,21 +1708,19 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) struct pnfs_layout_segment *lseg; struct inode *ino = lo->plh_inode; LIST_HEAD(free_me); - int status = -EINVAL; if (!pnfs_sanity_check_layout_range(&res->range)) - goto out; + return ERR_PTR(-EINVAL); /* Inject layout blob into I/O device driver */ lseg = NFS_SERVER(ino)->pnfs_curr_ld->alloc_lseg(lo, res, lgp->gfp_flags); - if (!lseg || IS_ERR(lseg)) { + if (IS_ERR_OR_NULL(lseg)) { if (!lseg) - status = -ENOMEM; - else - status = PTR_ERR(lseg); - dprintk("%s: Could not allocate layout: error %d\n", - __func__, status); - goto out; + lseg = ERR_PTR(-ENOMEM); + + dprintk("%s: Could not allocate layout: error %ld\n", + __func__, PTR_ERR(lseg)); + return lseg; } init_lseg(lo, lseg); @@ -1732,15 +1730,14 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) spin_lock(&ino->i_lock); if (pnfs_layoutgets_blocked(lo)) { dprintk("%s forget reply due to state\n", __func__); - goto out_forget_reply; + goto out_forget; } if (nfs4_stateid_match_other(&lo->plh_stateid, &res->stateid)) { /* existing state ID, make sure the sequence number matches. */ if (pnfs_layout_stateid_blocked(lo, &res->stateid)) { dprintk("%s forget reply due to sequence\n", __func__); - status = -EAGAIN; - goto out_forget_reply; + goto out_forget; } pnfs_set_layout_stateid(lo, &res->stateid, false); } else { @@ -1766,14 +1763,12 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) spin_unlock(&ino->i_lock); pnfs_free_lseg_list(&free_me); return lseg; -out: - return ERR_PTR(status); -out_forget_reply: +out_forget: spin_unlock(&ino->i_lock); lseg->pls_layout = lo; NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg); - goto out; + return ERR_PTR(-EAGAIN); } static void