From patchwork Tue Sep 23 21:36:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 4960381 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3A508BEEA5 for ; Tue, 23 Sep 2014 21:36:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 701B320254 for ; Tue, 23 Sep 2014 21:36:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A00D2024D for ; Tue, 23 Sep 2014 21:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756328AbaIWVgH (ORCPT ); Tue, 23 Sep 2014 17:36:07 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:40716 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756593AbaIWVgG (ORCPT ); Tue, 23 Sep 2014 17:36:06 -0400 Received: by mail-ig0-f182.google.com with SMTP id hn15so5411366igb.9 for ; Tue, 23 Sep 2014 14:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=3Gj2quhC+uVrcHLS5Rh+TUBnz9up8JWxAaj7UuSLnNY=; b=KumibedWGTDPmiE3s8XqWcyGMYpQA0DtqpDvOsskAEKTnmxqHLvMXbUsdSf6TpAiWP 2u03kGV6DazaJHtDLX3cYBWV3wAM7cd8haOQAlaUmNiNj5jw+wwtPkYjxG+QKb0ImgcG wL0BAIq1G3BBSM1Jy0sO9xaUbGUQMvOqeFPFZMCZaWwSWxX/5sf192q8o6xeU7R/SW/3 uXPGRfjI6ViV0vXU5Xb0s06Nbj1glVGsq4pmF/Gm9tocOuk3L9VuP8DlCNr8FaV9XvaA oqL4RP8xvuPEz2cc+8bEfE9LFYAVpLLhacCfbB70pv6Kh9GtDiNqm701HS7rZl2y/4XY n6ig== MIME-Version: 1.0 X-Received: by 10.50.114.38 with SMTP id jd6mr7109986igb.25.1411508165957; Tue, 23 Sep 2014 14:36:05 -0700 (PDT) Received: by 10.107.158.211 with HTTP; Tue, 23 Sep 2014 14:36:05 -0700 (PDT) Date: Tue, 23 Sep 2014 14:36:05 -0700 Message-ID: Subject: [PATCH 1/1] Fixing lease renewal From: Olga Kornievskaia To: linux-nfs 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.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Commit c9fdeb28 removed a 'continue' after checking if the lease needs to be renewed. However, if client hasn't moved, the code falls down to starting reboot recovery erroneously (ie., sends open reclaim and gets back stale_clientid error) before recovering from getting stale_clientid on the renew operation. --- fs/nfs/nfs4state.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 22fe351..790aed3 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -2345,6 +2345,8 @@ static void nfs4_state_manager(struct nfs_client *clp) status = nfs4_check_lease(clp); if (status < 0) goto out_error; + if (!test_bit(NFS4CLNT_MOVED, &clp->cl_state)) + continue; } if (test_and_clear_bit(NFS4CLNT_MOVED, &clp->cl_state)) {