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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham 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 0F403C28EBD for ; Sun, 9 Jun 2019 16:57:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D334F207E0 for ; Sun, 9 Jun 2019 16:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099469; bh=4U4izcSaOKzl/o61twDWLKRT4NOa+abMyqiXhluokoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Svt0CGdcC0ss4v1LAVT1+oybo8cTyoxQf1X9HTAqReQ+YE47SPeStmJmA8x5eVR8u wfqIEhXrOQ3iQeF6uoOssFPBGmWcCR41K0Q1yfR2tHl1akJR0mv0kQ057ZW39inI/7 bqch69edT5wdFOtmkAInK1DJf5nQEHX92xuNYKYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733245AbfFIQ5t (ORCPT ); Sun, 9 Jun 2019 12:57:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:60936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732638AbfFIQ5s (ORCPT ); Sun, 9 Jun 2019 12:57:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 CDE472084A; Sun, 9 Jun 2019 16:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099467; bh=4U4izcSaOKzl/o61twDWLKRT4NOa+abMyqiXhluokoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bkdbZlwxPLlQKIcXQzL7r1J4RAlBw0rPUOPTqkkWeMMZxdtaU2BothWlLbS7BNy8V i6IrwCWwC4Nl3dlAjiMFCgXnnUHqzhiSpVhlidr4Tbue9uCoQPGO7MRfiP89Y7Zawe Uc5mUCp0el885jbTiU4ujzSZPEPyUL7FsnU7dhOk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, ZhangXiaoxu , Anna Schumaker Subject: [PATCH 4.4 043/241] NFS4: Fix v4.0 client state corruption when mount Date: Sun, 9 Jun 2019 18:39:45 +0200 Message-Id: <20190609164149.018303773@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 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 From: ZhangXiaoxu commit f02f3755dbd14fb935d24b14650fff9ba92243b8 upstream. 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: Greg Kroah-Hartman --- fs/nfs/nfs4state.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -140,6 +140,10 @@ int nfs40_discover_server_trunking(struc /* 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;