From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ED5DC43381 for ; Mon, 18 Feb 2019 14:43:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E29A52173C for ; Mon, 18 Feb 2019 14:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550500998; bh=vkYkwIFK99thNPwdPcWu+7wF2m+TMtLbYE/1ZhoTp8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M4hsKCbcUoyVOnbWivsKE2M61SrCWx0lXGbmvc5IS0aEpNyM1q8Dhu9Rpek4yFk4e CDlVRT+8PbcZDfmGrMo9QmvR8Xo7/HRVnhTuIB4kequa7EKMDkJhgMktnVdnBVCqi9 ySbdJXFnAtw3YJ8wXiOO+4WGhB+Cr2qTgdgfZsDw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731209AbfBRNte (ORCPT ); Mon, 18 Feb 2019 08:49:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:56790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732037AbfBRNta (ORCPT ); Mon, 18 Feb 2019 08:49:30 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9204121901; Mon, 18 Feb 2019 13:49:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497770; bh=vkYkwIFK99thNPwdPcWu+7wF2m+TMtLbYE/1ZhoTp8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jX+J5kpnvEtj8hAPH/G/tmhkVjNhU41AUcGKffzFhLErszfEUUz0wwRFkzLnFcxk/ 9l4vOC7QXD6Kxz2UZBXvYznxkHzBbq7TEFnmS89LDX+HYKIlt4jjY4Jv6yDTygl3wv q7NLM0vldR4z/ATL5BxUVfK2tt5biRK/QtiBmhRY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Donald Buczek , "J. Bruce Fields" Subject: [PATCH 4.20 69/92] Revert "nfsd4: return default lease period" Date: Mon, 18 Feb 2019 14:43:12 +0100 Message-Id: <20190218133501.348145285@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133454.668268457@linuxfoundation.org> References: <20190218133454.668268457@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: J. Bruce Fields commit 3bf6b57ec2ec945e5a6edf5c202a754f1e852ecd upstream. This reverts commit d6ebf5088f09472c1136cd506bdc27034a6763f8. I forgot that the kernel's default lease period should never be decreased! After a kernel upgrade, the kernel has no way of knowing on its own what the previous lease time was. Unless userspace tells it otherwise, it will assume the previous lease period was the same. So if we decrease this value in a kernel upgrade, we end up enforcing a grace period that's too short, and clients will fail to reclaim state in time. Symptoms may include EIO and log messages like "NFS: nfs4_reclaim_open_state: Lock reclaim failed!" There was no real justification for the lease period decrease anyway. Reported-by: Donald Buczek Fixes: d6ebf5088f09 "nfsd4: return default lease period" Cc: stable@vger.kernel.org Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfsctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1239,8 +1239,8 @@ static __net_init int nfsd_init_net(stru retval = nfsd_idmap_init(net); if (retval) goto out_idmap_error; - nn->nfsd4_lease = 45; /* default lease time */ - nn->nfsd4_grace = 45; + nn->nfsd4_lease = 90; /* default lease time */ + nn->nfsd4_grace = 90; nn->somebody_reclaimed = false; nn->clverifier_counter = prandom_u32(); nn->clientid_counter = prandom_u32();