From patchwork Sun Sep 28 03:54:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4990871 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF8239F2BB for ; Sun, 28 Sep 2014 03:55:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2ACE2021B for ; Sun, 28 Sep 2014 03:55:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C986720219 for ; Sun, 28 Sep 2014 03:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262AbaI1DzE (ORCPT ); Sat, 27 Sep 2014 23:55:04 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:36216 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752322AbaI1DzE (ORCPT ); Sat, 27 Sep 2014 23:55:04 -0400 Received: by mail-ig0-f178.google.com with SMTP id l13so45401iga.5 for ; Sat, 27 Sep 2014 20:55:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=NG2fm/B+FfoDbSMDtIBzjreuak9zedFu7PHT4xGmJ3M=; b=iZZd4THEsjUueNfbDwQfIqXwVt2MQYOkowgWJuCajiiBrwlq6jNtp+BUWVvhgQ2JLr TBOrXbNuU/wLxxsh/4tvu/3KdAMJ4ZsjT5gDLSBK+G/XW6949NaSJtv4ojmIgI10nDxB OK7ZJwmxFphG2PKDPyjRnb6YIhTYw/ndaparOfJ+Qx9THdn1MFmlo5hU66fNzzINzble hPwcGSKpB63hKfY1NStIdJRrBXFHaT1Pu3xWV4eyFF8p5Q2AWtLkSNL8CvQRdJnJXvJQ nBQVHmII50XHfam+AmoyNGylwDoql52r5QjyIbMTmSOy7Q0svJIw0tDPMe+XULIMMqJo eehw== X-Gm-Message-State: ALoCoQnVhdMZBjFWd/gY09Iqf3Z1EtnoNO7vnDmNwyZ0XWcx0bfuGYnacDe3zWQujWy8YB8tz914 X-Received: by 10.50.79.129 with SMTP id j1mr41911189igx.47.1411876503456; Sat, 27 Sep 2014 20:55:03 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([50.127.254.153]) by mx.google.com with ESMTPSA id n8sm6191101igj.9.2014.09.27.20.55.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Sep 2014 20:55:03 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/2] NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails Date: Sat, 27 Sep 2014 23:54:57 -0400 Message-Id: <1411876498-12039-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1411876498-12039-1-git-send-email-trond.myklebust@primarydata.com> References: <1411876498-12039-1-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-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 If a NFSv4.x server returns NFS4ERR_STALE_CLIENTID in response to a CREATE_SESSION or SETCLIENTID_CONFIRM in order to tell us that it rebooted a second time, then the client will currently take this to mean that it must declare all locks to be stale, and hence ineligible for reboot recovery. RFC3530 and RFC5661 both suggest that the client should instead rely on the server to respond to inelegible open share, lock and delegation reclaim requests with NFS4ERR_NO_GRACE in this situation. Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust Acked-by: Jeff Layton --- fs/nfs/nfs4state.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 22fe35104c0c..26d510d11efd 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1761,7 +1761,6 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) break; case -NFS4ERR_STALE_CLIENTID: clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); - nfs4_state_clear_reclaim_reboot(clp); nfs4_state_start_reclaim_reboot(clp); break; case -NFS4ERR_CLID_INUSE: