From patchwork Mon Nov 14 16:19:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9427887 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 F1E4160756 for ; Mon, 14 Nov 2016 16:20:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F04428A10 for ; Mon, 14 Nov 2016 16:20:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136C728A2F; Mon, 14 Nov 2016 16:20:08 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 C7E8328A10 for ; Mon, 14 Nov 2016 16:20:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbcKNQUG (ORCPT ); Mon, 14 Nov 2016 11:20:06 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:34743 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423AbcKNQUF (ORCPT ); Mon, 14 Nov 2016 11:20:05 -0500 Received: by mail-it0-f66.google.com with SMTP id q124so15178982itd.1 for ; Mon, 14 Nov 2016 08:20:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=C59e/lf12LAfjh22/1fAJlFB8gZ5LISMcQ0RZXVnI5A=; b=iNIbyblmD69R180Umf+hoS6X4lyWUZN6HnyqTPxeRXxorplq6zKY9fjVTuJ7zKqqyq Wy9i27gaJAax4gx57sRXMAXLhk2yFnTpAf1LyhrVX9BUKvBHTddhSN1TcDpV8Rc+CS9f YltKYgly4Mxq148ZyCce8nQSxBIEFBQyZPLdgI+hLyC5nh6Wn9ss+ih/+msn3nwV5sLv C4b7GzFvZi4UM1FaClrBc8XNiDNWcgFJHSPTN0wipTRUj2t7yOBkUxK847UGNJEqdSmh G//zWHbmBZVqHLy0ErSUdvqKIuSiD2/CLWoHVJ7553s0pd9OrDJAPKzgsafBJQLEpR5Y MTDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=C59e/lf12LAfjh22/1fAJlFB8gZ5LISMcQ0RZXVnI5A=; b=ku9giJw15lH6Swg4QsCfb+5+5W4E2dYROfG7jDWwW18iw4bih4olP6Eee0aHBzlV5K we3NweuPYz/5oceWIRb9MfRvylmnCr1nHQPjnCMaI72j9WlevpYamjsEB2y15pnMXzGq BJFYGpXL3U65X1Bum2yR6CbL4EhAf6ZKxeOpw137VG9iNZb0GhDEpG9k9weWygVIrauw DBvVmCioYDBdoohSFGirGFT3Ipin0YQp1g/DDlKZFCrn343XYEN7RG7KMjF9h93TKPzu 0rPWc/ryAezT3eeq6cPaTBk6zBH/t0RGvTweTLrM9uli7Oh1kKeVSvLe5BXybgBVGhdL NbrA== X-Gm-Message-State: ABUngvd413yVQCR3dgQLm8XDmnmWF4zHwkS1hhVwUHBDNuskK5Uo5K0/6varCp8nqWLqyg== X-Received: by 10.36.26.23 with SMTP id 23mr3952748iti.84.1479140400017; Mon, 14 Nov 2016 08:20:00 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 197sm9542482iou.42.2016.11.14.08.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 08:19:59 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Cc: Benjamin Coddington , Jeff Layton Subject: [PATCH 2/2] NFSv4: Don't call close if the open stateid has already been cleared Date: Mon, 14 Nov 2016 11:19:56 -0500 Message-Id: <1479140396-17779-3-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479140396-17779-2-git-send-email-trond.myklebust@primarydata.com> References: <1479140396-17779-1-git-send-email-trond.myklebust@primarydata.com> <1479140396-17779-2-git-send-email-trond.myklebust@primarydata.com> 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 Ensure we test to see if the open stateid is actually set, before we send a CLOSE. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b7b0080977c0..b801040c9585 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3129,7 +3129,8 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) } else if (is_rdwr) calldata->arg.fmode |= FMODE_READ|FMODE_WRITE; - if (!nfs4_valid_open_stateid(state)) + if (!nfs4_valid_open_stateid(state) || + test_bit(NFS_OPEN_STATE, &state->flags) == 0) call_close = 0; spin_unlock(&state->owner->so_lock);