Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp761950rwl; Thu, 5 Jan 2023 04:17:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGjXo5CP7usHnv1ZX/dVMUgKTTTaHC9nwyI4R3Ent6ahHzDWPBCwJH2TT0BPU9d4leU/y6 X-Received: by 2002:a17:907:874c:b0:7fc:4242:f9ec with SMTP id qo12-20020a170907874c00b007fc4242f9ecmr42661363ejc.43.1672921052566; Thu, 05 Jan 2023 04:17:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672921052; cv=none; d=google.com; s=arc-20160816; b=U64nR8fxLg16DpOA1PhyddVbpcAXyAE/WFKI9IDJFKzkhjmcKq+UtPebZfdI9T3TXH stw1/q7pL+6uqISxgO+CuLqc5ZDLhpFOb6Jt3aG2hiP5UJX2aITjQTfglRCMePCD07AE EqK79lAkhum+PZsS54RfCZ/OIPXtcb7OCZpAKnCzUo2OIvYh3mleBmyLe39nCjPgBXPV D1U+WxyGFwLwDVezJso3IeqFULpv+Y/K/nQuyHzqCnritXrx0EM0V2BTokW3d+qCye0F rV3zlS1WvHyU9jCYLeGWJnSnFYPGknYEYD5C3bNeMzUM4vrUQcyoRdSE00Utv0I/ZfgP 93vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YZEAHbSj33Zm+/uWW2Hp5FSLBSY+QScmBH7huZhm6fo=; b=f+Xp3sukzEHIhelIFFAw+HJN7U7VoQ3rQkivGirfC3VQTt3LShuvaEoyJ0eoZ+5mlG sjekRjm0nziuqi1uJUweg09bOk9yevcFqXN91MjGKIZgDztcu5jDcCwDt87NIkBfbA1I BO6tcV7kgdxF5xZ2bRoSMY9GdQRzVLX3dZS2X09erc2bM9J02VFGOkA8CClAKw3/kaCR HAWg4OKjB71oFeFF/D7l589ZDmWbrgTOZIPJdlyUMferHRNKQiTlvmdVU0pG5L751AWQ WlTccuYHm/EHnO1cJX7ivVLm7lN/JTDJyli/zSBzQqwfJurdDLwmeKqaM91HRVSL5rMZ Ihlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XTZEYQfW; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn21-20020a17090794d500b007a087ccd275si36966786ejc.384.2023.01.05.04.17.08; Thu, 05 Jan 2023 04:17:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XTZEYQfW; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbjAEMPV (ORCPT + 99 others); Thu, 5 Jan 2023 07:15:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbjAEMPS (ORCPT ); Thu, 5 Jan 2023 07:15:18 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D98C458FAA for ; Thu, 5 Jan 2023 04:15:17 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8E22FB81ABD for ; Thu, 5 Jan 2023 12:15:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00D63C433D2; Thu, 5 Jan 2023 12:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672920915; bh=RsJimtyejEI6shLrI7EHKX2SRLnEOu+qhk4RqOFVT50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XTZEYQfWcUR+yzNLUkcfLRS7y872q5zO0s9My8usT5lf6M6YN69GNY3MhmQQcBehQ jKH9DnKiTWKplSFzVeZ9FAtms+UhI3KKBOIg/7dITxFW/8MyiYYhIOXIsITJQ0ofvP lkgNg4MgqRH60vTp1Pz0aCuy4Obwqpwhotfj7kBb2UT9jnQCdHqGcYsQ5VY6jq9Gb+ c4VAKj20t1FI/+HgresmDTvlwI0VupOVDiZwVL2E4+9GI1CyRxJpFHgfk/mGbzlEjf +r0Chf/N29xiS6VJNljKKlCVjkmmvwA7SsLO02RwsbA2cRXM8PmBBSE1Qat7K09l/c GuWkdF/UYI8ew== From: Jeff Layton To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/4] nfsd: don't open-code clear_and_wake_up_bit Date: Thu, 5 Jan 2023 07:15:09 -0500 Message-Id: <20230105121512.21484-2-jlayton@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105121512.21484-1-jlayton@kernel.org> References: <20230105121512.21484-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/nfsd/filecache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 6674a86e1917..9fff1fa09d08 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -1184,9 +1184,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, status = nfserr_jukebox; if (status != nfs_ok) nfsd_file_unhash(nf); - clear_bit_unlock(NFSD_FILE_PENDING, &nf->nf_flags); - smp_mb__after_atomic(); - wake_up_bit(&nf->nf_flags, NFSD_FILE_PENDING); + clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags); goto out; } -- 2.39.0