Received: by 2002:a05:6a10:8a4d:0:0:0:0 with SMTP id dn13csp182755pxb; Thu, 12 Aug 2021 13:50:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFo53JBCi5+cTZij7hAAoqU6o0U/SIudma353XadYkDwEE5y3xkp8smfmwT95BkuNI8IFV X-Received: by 2002:a05:6402:148:: with SMTP id s8mr7927034edu.298.1628801438168; Thu, 12 Aug 2021 13:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628801438; cv=none; d=google.com; s=arc-20160816; b=SaLaYpSGhWqLGf2xSJroI6Uncrqybm5MFhL3obRUrCNasD8K4DCaCKNVUas5hHQTBv jmqIMOgvJL06DOztadwbDD90AAzeyxARJQn3qR3qlD7GJPHsnes9zLLQKdox4k7D33rh kPoZ5aXxjmJIoHPndJjzPBXhnb/nTzUr6rRyrDB8uWa9Fb7eLIftOmYB6buG4X/afKPx /JT1g2HvKz4R5CztNJgMm+qn9ZE/Qw4pNNK7LCBDllYzGdg5Odr0rdfkPxAGFsCJ/Yzz gNVThfrB5nlGGHsoRjCUKJSgTGY0wwTfzyVYiBcL6ErLq3IjG77GUgDhGKTYOS3KwRp6 m+EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-filter; bh=iTy82wsQAcncp+PXHuXdUcgLnudg5jfM6qxH1ayu/Fg=; b=goAed7SCHO0f5gdD6/5FKfY8owMitwH0suOAb/99c9dSVKuiBqAVm6O9ZtZq9HZ2Cd mj1wluYs2ShBkED0WwbsPKN1gkpTGviUfMRMA5Pm43lc4CdXPBlInANzze5421QNGHKi vm7p8uNxUdt8x8iZKppGs7fm8Pl+0sZhFROHaoH+xRu7EeZzqMgXAWX6CDcGpi34mNsE BHH9oourw5fnTyCXLjBKH9xRHN0XWT3njB28uPNkqXNw4xDgIILgXbavME+dxno9YwP5 h/OamofD9q6q0KdZgbuq30d1QSlT6kBoIISkhrk3tgoX/STQblk3H+FHsF2d/kb8gVye 5glw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x2si4416106ejy.297.2021.08.12.13.50.14; Thu, 12 Aug 2021 13:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235486AbhHLUmM (ORCPT + 99 others); Thu, 12 Aug 2021 16:42:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237853AbhHLUmK (ORCPT ); Thu, 12 Aug 2021 16:42:10 -0400 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BCB2C0617AE for ; Thu, 12 Aug 2021 13:41:45 -0700 (PDT) Received: by fieldses.org (Postfix, from userid 2815) id 92A601BE2; Thu, 12 Aug 2021 16:41:44 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 92A601BE2 From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 2/2] nfsd4: Fix forced-expiry locking Date: Thu, 12 Aug 2021 16:41:43 -0400 Message-Id: <1628800903-10760-3-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628800903-10760-1-git-send-email-bfields@redhat.com> References: <1628800903-10760-1-git-send-email-bfields@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" This should use the network-namespace-wide client_lock, not the per-client cl_lock. You shouldn't see any bugs unless you're actually using the forced-expiry interface introduced by 89c905beccbb. Fixes: 89c905beccbb "nfsd: allow forced expiration of NFSv4 clients" Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 212f43fa5cba..1b6a7f48982e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2687,9 +2687,9 @@ static void force_expire_client(struct nfs4_client *clp) trace_nfsd_clid_admin_expired(&clp->cl_clientid); - spin_lock(&clp->cl_lock); + spin_lock(&nn->client_lock); clp->cl_time = 0; - spin_unlock(&clp->cl_lock); + spin_unlock(&nn->client_lock); wait_event(expiry_wq, atomic_read(&clp->cl_rpc_users) == 0); spin_lock(&nn->client_lock); -- 2.31.1