From patchwork Tue Sep 20 16:56:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342157 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 8CB51607D0 for ; Tue, 20 Sep 2016 16:56:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E62629495 for ; Tue, 20 Sep 2016 16:56:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733E929979; Tue, 20 Sep 2016 16:56:56 +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 2B71629495 for ; Tue, 20 Sep 2016 16:56:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932933AbcITQ4z (ORCPT ); Tue, 20 Sep 2016 12:56:55 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:32774 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932692AbcITQ4y (ORCPT ); Tue, 20 Sep 2016 12:56:54 -0400 Received: by mail-qk0-f194.google.com with SMTP id n66so1454799qkf.0 for ; Tue, 20 Sep 2016 09:56:54 -0700 (PDT) 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=H/z6SEMsTEN7iW7Zm9lBQwwx4kR4vWfQ3tQsik45QFA=; b=C5OxUysahMk3u1msaRKVvfArBDvEP9mKqZLN+CTJmxT6EaE3OtpycE8X434E+Piedk XxgCDfgeJX0idjHWJvoNODtB/GL0av24+0VYj0n0LTKcxEnG18IWFqHRAObqBDCNvYzy QpYdHcBIMRZdFCKR6SI3jzQITYfkRUBrf/TEaS+zuYC93JaszpOfujjVa9M7bD8hBhz+ DtHjwO5vS9iMlvb43kDUc42YQWieODPVvtBDF16l32HWody3V6dKOkj+4gmIms2ilzXq xn5LUxKUneWJ50Oh5XFce2oCHn1WrCqWX1az8c6IkN+AowghnGjJ5V+0gWqbdfgye75v Z++w== 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=H/z6SEMsTEN7iW7Zm9lBQwwx4kR4vWfQ3tQsik45QFA=; b=X/My9zrtO/d6GH2rvfQtqnaJZRSCbvgZg95C0dAV6Tr/t+t/oSlymK82dSCawgKUee R93/FU9tVxlv1+oxVle355CT4pBAAMJjqELL+cPGbLmGDG/E6tSJD3F7AJvQXYEqBXWQ bhAHd+LI9ezkQW77yeLKiB9mNMsbLLfHdXzj+LRPweVPZ7oYECdC51Sz2DRe/TLBKfhO +INjuuK2n6OwvXoxA70WpAcbneaQDHR5D2pjhLi4QI/tsMN7v7Oj7koOBtj0qwAjxwsU D6RP4cqNw0o+tpjuWtXdUFwHjqDZY9QILoOFRPbA/+nNPl9tyLve/I5HnYTkYWTw0bDo lN5Q== X-Gm-Message-State: AE9vXwMiDFhr6xgZ7t7YU8VpvtCFsPhmpNSinqM6QjeCGDu7qXBoFW1gHdCNEmPVHUMafw== X-Received: by 10.55.59.70 with SMTP id i67mr39566797qka.205.1474390613493; Tue, 20 Sep 2016 09:56:53 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-108-86-94.adr01.mskg.mi.frontiernet.net. [50.108.86.94]) by smtp.gmail.com with ESMTPSA id i4sm16537202qte.40.2016.09.20.09.56.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:53 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 27/29] NFSv4: Mark the lock and open stateids as invalid after freeing them Date: Tue, 20 Sep 2016 12:56:09 -0400 Message-Id: <1474390571-17106-28-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-27-git-send-email-trond.myklebust@primarydata.com> References: <1474390571-17106-1-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-2-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-3-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-4-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-5-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-6-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-7-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-8-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-9-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-10-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-11-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-12-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-13-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-14-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-15-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-16-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-17-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-18-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-19-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-20-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-21-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-22-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-23-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-24-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-25-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-26-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-27-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 Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 995b646c9aea..2e1f9c30b805 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2560,6 +2560,7 @@ static int nfs41_check_expired_locks(struct nfs4_state *state) if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID) { clear_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags); + lsp->ls_stateid.type = NFS4_INVALID_STATEID_TYPE; if (!recover_lost_locks) set_bit(NFS_LOCK_LOST, &lsp->ls_flags); } else if (status != NFS_OK) { @@ -2605,6 +2606,7 @@ static int nfs41_check_open_stateid(struct nfs4_state *state) clear_bit(NFS_O_WRONLY_STATE, &state->flags); clear_bit(NFS_O_RDWR_STATE, &state->flags); clear_bit(NFS_OPEN_STATE, &state->flags); + stateid->type = NFS4_INVALID_STATEID_TYPE; } return status; }