From patchwork Thu Sep 22 17:39:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346037 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 896FE607D0 for ; Thu, 22 Sep 2016 17:40:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 833BD28580 for ; Thu, 22 Sep 2016 17:40:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77DD62ABF3; Thu, 22 Sep 2016 17:40:16 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 2B48828580 for ; Thu, 22 Sep 2016 17:40:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935019AbcIVRkM (ORCPT ); Thu, 22 Sep 2016 13:40:12 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:34260 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965901AbcIVRkE (ORCPT ); Thu, 22 Sep 2016 13:40:04 -0400 Received: by mail-it0-f65.google.com with SMTP id 186so5344146itf.1 for ; Thu, 22 Sep 2016 10:40:04 -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=k9Zx6eNgsAOFb4FzUM1qvKaLiziEVPBqd97IspmQqEE42tHNr1AuQvgLCMtZsr3hIM pTDQZH6HFFnAwH5O+1fx3yd+TN47jEgzCDT9jXEN4wqYjPM5h7G+0mzS/lyvA72PoE7J 5zboeLaalYXSKCF3zCEm+vczDwfQhsXGmjwn4UdaP+qecxBuYpKXfmbHUnozqJ2l5fBI 3/OwwR3KWw9gUPWd4z9k+XBa176ks6kT8JciB4jM7kS+mUqCaUEuI+2wNNk35NNWL3pV jas8h56A571ZE1iso1BVDQpbGn1MKozcT9UM+WBJEyd4bd2jxIBnCjAYMnO3isOh/lbU NrXg== 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=ki0LUBZIwqWEDzMlTgNrzogY6amLU2/AbteQDcnX3l8A3H739bmXbMzKCGqUCdGJXG daTti/T2qQPzqvl+Js/bKpwg0kkcHN07TLzEjFytYO24MlZ70ArY6N06PhU4HCZe0/lY j8lb8x0xXHyZcuzxD88kbyTASsfIp9KD0gWY/gLe7DbmWmTo8Rf67KXn4KM/YlKnbuFk QXAWZBUUQy4j08AKtPzFWct7aHtU04oH/GZBVY61U1tIZYop59r4HsuZGiVB+eSGhmtV yFJOx4fz+cpC2asGo1VghYx7hIWttBns5FbK/RGiJMu8Jo7mEZqCseiPjHzHQNGuQvV+ 98tg== X-Gm-Message-State: AE9vXwM6zKoh9AsPGEiaOaZm6yoxGin7d+BJzohqLKiFO9LwjKuwDNIUKoFGpE9zRNYbkw== X-Received: by 10.36.216.138 with SMTP id b132mr4338244itg.38.1474566003676; Thu, 22 Sep 2016 10:40:03 -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 e66sm1194267itd.22.2016.09.22.10.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:40:03 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 27/31] NFSv4: Mark the lock and open stateids as invalid after freeing them Date: Thu, 22 Sep 2016 13:39:17 -0400 Message-Id: <1474565961-21303-28-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-27-git-send-email-trond.myklebust@primarydata.com> References: <1474565961-21303-1-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-2-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-3-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-4-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-5-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-6-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-7-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-8-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-9-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-10-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-11-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-12-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-13-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-14-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-15-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-16-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-17-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-18-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-19-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-20-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-21-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-22-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-23-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-24-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-25-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-26-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-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; }