From patchwork Fri Jun 15 22:42:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10467795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADD54600F4 for ; Fri, 15 Jun 2018 22:43:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EA7828EA8 for ; Fri, 15 Jun 2018 22:43:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8341A28EAC; Fri, 15 Jun 2018 22:43:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2981C28EA8 for ; Fri, 15 Jun 2018 22:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756519AbeFOWnD (ORCPT ); Fri, 15 Jun 2018 18:43:03 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:33429 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756715AbeFOWnA (ORCPT ); Fri, 15 Jun 2018 18:43:00 -0400 Received: by mail-io0-f194.google.com with SMTP id d185-v6so12089403ioe.0 for ; Fri, 15 Jun 2018 15:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gsi13LZHJsOO1HJ1BvJl0c+nrIyS2ozguokjglE5gjI=; b=g7m/erdTLz6RxJd9YSq4KXxMrp1GHzLI6Fh2EMaGnt40dbRdQ4xm2r6BUhg/FM/wHJ /ql6c44bMMvGvHOMsb1Pyo7d7rdtqtUhW9qJR177El/MnYcYEe8BNr/7BR7ZYfemx2xY e5a2rJMB/EOOYJpw1hIq/Z3S6LXhA5so/zsHTQuoJRA4cHYbY/JWmz08XD51zoyxjgaC LTyht544KUbGamP6h4uGxYxtTMn2IH50lTsdT0ousBWwj21QmyKoVcWMXm9uHgsfIqc+ ouJwT+k5QDF2JqgczshO5S/QvbVC7zLNz/Jtfx+2Yhm0exCbuPM9LxTrYR4CEE5CcTLF /99Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gsi13LZHJsOO1HJ1BvJl0c+nrIyS2ozguokjglE5gjI=; b=pUAaPQkN2xWbtHaK3A8CszL8s/ppBfrr+0qkxGiPfORcDSx4hxnigPT/HDCe3NS+Su S4WGddSHS85pnvHPlXIyF+jZ1KSeDhLihfSsoKmmmd7FiozueeLsj7sXm2W9UIhuTO3L Eg4lfutvYvlih5iE+YSHbUVoDg9FzO/qMLyBog7fuMCHmOcqvCfR7Vm1WlrwQxpNcFUS 5QfNPOoSeEhhvgWVdtZMeUsHj8PkLjM50ZAw7663gzf+sR+EJlVLqzjik42xifORVI9m TDG8xMYZpZv1f4KABfbdNApcsH8v1yjyLyCLCe5q1Ru7+xuzwBur16ooOEqAlD/bqqxj Wolw== X-Gm-Message-State: APt69E1GSZSJJM/5Tdb3r7chN4abFI64bBnEfhVC04bXEGBhWsVpIw0y 2AzxRiKHD0YTigz0CsxaWkoRJ+M= X-Google-Smtp-Source: ADUXVKIROjc7qmlrGqiExpTeDmF8TAExdA/gfXFmseySBdOH5EGfYdwEx4PT179Kjnohr8dR7pxa+A== X-Received: by 2002:a6b:9bc2:: with SMTP id d185-v6mr2924511ioe.95.1529102579774; Fri, 15 Jun 2018 15:42:59 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-245-47.alma.mi.frontiernet.net. [50.124.245.47]) by smtp.gmail.com with ESMTPSA id b100-v6sm1498214itd.16.2018.06.15.15.42.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 15:42:58 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] pNFS: Don't send layoutreturn if the layout is already invalid Date: Fri, 15 Jun 2018 18:42:34 -0400 Message-Id: <20180615224234.62723-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615224234.62723-1-trond.myklebust@hammerspace.com> References: <20180615224234.62723-1-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the layout was invalidated due to a reboot, then don't try to send a layoutreturn for it. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 2c8c2696415e..6dd146885da9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3294,6 +3294,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) struct nfs4_closedata *calldata = data; struct nfs4_state *state = calldata->state; struct inode *inode = calldata->inode; + struct pnfs_layout_hdr *lo; bool is_rdonly, is_wronly, is_rdwr; int call_close = 0; @@ -3337,6 +3338,12 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) goto out_wait; } + lo = calldata->arg.lr_args ? calldata->arg.lr_args->layout : NULL; + if (lo && !pnfs_layout_is_valid(lo)) { + calldata->arg.lr_args = NULL; + calldata->res.lr_res = NULL; + } + if (calldata->arg.fmode == 0) task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE]; @@ -5972,12 +5979,19 @@ static void nfs4_delegreturn_release(void *calldata) static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) { struct nfs4_delegreturndata *d_data; + struct pnfs_layout_hdr *lo; d_data = (struct nfs4_delegreturndata *)data; if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task)) return; + lo = d_data->args.lr_args ? d_data->args.lr_args->layout : NULL; + if (lo && !pnfs_layout_is_valid(lo)) { + d_data->args.lr_args = NULL; + d_data->res.lr_res = NULL; + } + nfs4_setup_sequence(d_data->res.server->nfs_client, &d_data->args.seq_args, &d_data->res.seq_res, @@ -8820,6 +8834,8 @@ nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata) &lrp->args.seq_args, &lrp->res.seq_res, task); + if (!pnfs_layout_is_valid(lrp->args.layout)) + rpc_exit(task, 0); } static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)