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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 29A88C28CC4 for ; Sat, 1 Jun 2019 13:43:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDD4825E30 for ; Sat, 1 Jun 2019 13:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559396588; bh=PIo8SjCgagns8c0TxIuWYMdhiT5v1mEvZvV10R2Q5bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mh6HQ/t5wk8v9re15YLpF/BT57C5UScGeXMRpel2+4hc0BOtsXOfqTaC5bELk4don qa4MHI+Ln4C8OmbuFxzGU39eYipq6cPZAHdEOOcaomz/2XyDzNts0CN5TSuWQ4IyNc 2KzItuhSNt+TkdAfxYLI4Ah+uSVzuO/+suzju6vI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727846AbfFANSh (ORCPT ); Sat, 1 Jun 2019 09:18:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:45636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727836AbfFANSf (ORCPT ); Sat, 1 Jun 2019 09:18:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A72C27278; Sat, 1 Jun 2019 13:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395115; bh=PIo8SjCgagns8c0TxIuWYMdhiT5v1mEvZvV10R2Q5bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBgQBZlholP9OQSyZH8SQdHplrWHuYo4XPhbfOkkjAkTnDT9vofNNMLTEOCBF9HrJ lDtjklpNHJyccqWrVk9E7DgYzpUq6QE8HttG/HkZ7htWPwtJzX4L3SqDcUZdj7Yqe7 EdfSe9zZ6NqFaWxBSJQR7tBjwohFjwUMG8kvBWWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ZhangXiaoxu , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 039/186] NFS4: Fix v4.0 client state corruption when mount Date: Sat, 1 Jun 2019 09:14:15 -0400 Message-Id: <20190601131653.24205-39-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: ZhangXiaoxu [ Upstream commit f02f3755dbd14fb935d24b14650fff9ba92243b8 ] stat command with soft mount never return after server is stopped. When alloc a new client, the state of the client will be set to NFS4CLNT_LEASE_EXPIRED. When the server is stopped, the state manager will work, and accord the state to recover. But the state is NFS4CLNT_LEASE_EXPIRED, it will drain the slot table and lead other task to wait queue, until the client recovered. Then the stat command is hung. When discover server trunking, the client will renew the lease, but check the client state, it lead the client state corruption. So, we need to call state manager to recover it when detect server ip trunking. Signed-off-by: ZhangXiaoxu Cc: stable@vger.kernel.org Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/nfs4state.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 3de36479ed7a1..f502f1c054cf7 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -159,6 +159,10 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, /* Sustain the lease, even if it's empty. If the clientid4 * goes stale it's of no use for trunking discovery. */ nfs4_schedule_state_renewal(*result); + + /* If the client state need to recover, do it. */ + if (clp->cl_state) + nfs4_schedule_state_manager(clp); } out: return status; -- 2.20.1