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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C008C433F5 for ; Mon, 28 Mar 2022 19:49:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344080AbiC1Tu4 (ORCPT ); Mon, 28 Mar 2022 15:50:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344007AbiC1TsE (ORCPT ); Mon, 28 Mar 2022 15:48:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A38186973F; Mon, 28 Mar 2022 12:43:44 -0700 (PDT) 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 4D8AAB81205; Mon, 28 Mar 2022 19:43:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A0C4C36AE5; Mon, 28 Mar 2022 19:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648496611; bh=RFxO9xF6t5YjxDSa/9vY21MmN/AHRRJpq/CrMwSlBaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vImC58N/GvB2dt8w7eKKURuo1TrAp9pAu5w6nRbTz8LcsEkX3GAfHlglPR31ni5ug 1+zcvgEPdx8lpEY0qcr7Nf8YqO63kfzZ1bB/Z2fCo5tXcrgyONAoB8uRzUCkNNeUFy PsJDcB8jIjvLWfUvW8o/IjHikY79emLlZx6F3zxOGoglEmYr9PC/CZpA9Hq8BFiNfu w/vYdr056MPYKwZqs+2QkFZKFaDEzOMvVNJJpg5txM3zQ0TZ+I7mteoZNYK3ri3lW1 ii2LnBYL4uXUaFMNjc69xrT5sNqmzBF2eW1XBpPGm1w867MRhU+dP3Hffr1jexrU0O 2vcInZ2Etha5A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuck Lever , Dai Ngo , Sasha Levin , bfields@fieldses.org, jlayton@poochiereds.net, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 6/8] NFSD: Fix nfsd_breaker_owns_lease() return values Date: Mon, 28 Mar 2022 15:43:20 -0400 Message-Id: <20220328194322.1586401-6-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328194322.1586401-1-sashal@kernel.org> References: <20220328194322.1586401-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuck Lever [ Upstream commit 50719bf3442dd6cd05159e9c98d020b3919ce978 ] These have been incorrect since the function was introduced. A proper kerneldoc comment is added since this function, though static, is part of an external interface. Reported-by: Dai Ngo Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d01d7929753e..84dd68091f42 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4607,6 +4607,14 @@ nfsd_break_deleg_cb(struct file_lock *fl) return ret; } +/** + * nfsd_breaker_owns_lease - Check if lease conflict was resolved + * @fl: Lock state to check + * + * Return values: + * %true: Lease conflict was resolved + * %false: Lease conflict was not resolved. + */ static bool nfsd_breaker_owns_lease(struct file_lock *fl) { struct nfs4_delegation *dl = fl->fl_owner; @@ -4614,11 +4622,11 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl) struct nfs4_client *clp; if (!i_am_nfsd()) - return NULL; + return false; rqst = kthread_data(current); /* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4) - return NULL; + return false; clp = *(rqst->rq_lease_breaker); return dl->dl_stid.sc_client == clp; } -- 2.34.1