From patchwork Mon Apr 22 21:31:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dai Ngo X-Patchwork-Id: 13639030 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD1AF1CD0C for ; Mon, 22 Apr 2024 21:31:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713821498; cv=none; b=Jf2vlBCzkqsKS7gg+tzAyg1mKGuUUELjb0k5GeG82qooHGMtBeJqTI7zIsee+1vaTS1MPpZrtIplzQrym3HH7pGAVViB7/t504aEvjfb/JleJK9z17ugxYkHAG2hH4YaiEwzs7ndIGAbzpcX4oZZq/nlsBlYF6q9KSxsiL9DqWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713821498; c=relaxed/simple; bh=n2iABvu4jzNMv28Q0kHWlr62XDxaaIVOyXfwMIVxwG4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=cmX6V3HWJgPabJhQyXSzCeVld8BzJNQJ9N4VfoapwpzcnXevNuHsCcdRiMVN1bycNVfX6WQlWhM3LBt10Jbj6P/YIlV7vKK/+id7tMt0vE3kMVPs/vMfrLKSP57y3Rju0809AqYdHmNd1Hq1ihLM/g3Dm2b51ek3HbW7H18Ixks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=HZ9ewPqz; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="HZ9ewPqz" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43MHmjso017355; Mon, 22 Apr 2024 21:31:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=hR/6xUHOjAJUSUlB/K9DyntUMzRZrTpcVkIhovIouEY=; b=HZ9ewPqzxmav+HYfH30gq/4t7t2YOp41dlMUtYtXVV9jFYxdTLHjY1QfK68mbdWt0CKQ ETz/UM598n8s2pNeYPbgEl8oQ2QfzYUzJhIZDQcyW0Ig9dof3w8B7ecGFbOSM2kpi46P EubTdbrOm+rKAYcPm0NwdTwZPxCHA6snDCMxQcLM32D8R1QQdq3roNno58s9HMswA2lE 8ROR9fUsDVVdwYEVPkqKbqTIzvN3wt+6ZrRctCnSPv8nvllyXepHyey7OQlGHlgTSitN JF1zcMJxl7GW2RigDcZ9cSfTEiqEfgJoX+nDSxdhv8MzYrvoswRPQyNdV7cPt0M8JNAU XA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xm4g4bsd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Apr 2024 21:31:31 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43MKTZTa033774; Mon, 22 Apr 2024 21:31:30 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xm4569817-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Apr 2024 21:31:30 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 43MLUw1P008733; Mon, 22 Apr 2024 21:31:30 GMT Received: from ca-common-hq.us.oracle.com (ca-common-hq.us.oracle.com [10.211.9.209]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3xm456980c-3; Mon, 22 Apr 2024 21:31:30 +0000 From: Dai Ngo To: chuck.lever@oracle.com, jlayton@kernel.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/3] NFSD: add helper to set NFSD4_CLIENT_CB_KILL to stop the callback Date: Mon, 22 Apr 2024 14:31:14 -0700 Message-Id: <1713821475-21474-3-git-send-email-dai.ngo@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1713821475-21474-1-git-send-email-dai.ngo@oracle.com> References: <1713821475-21474-1-git-send-email-dai.ngo@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-22_15,2024-04-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 malwarescore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404220090 X-Proofpoint-GUID: _leMx5pY0RWB6APpX55A6vQxrIUTBM7n X-Proofpoint-ORIG-GUID: _leMx5pY0RWB6APpX55A6vQxrIUTBM7n Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Add helper for nfs4state functions to set NFSD4_CLIENT_CB_KILL to stop the callback. Signed-off-by: Dai Ngo --- fs/nfsd/nfs4callback.c | 5 +++++ fs/nfsd/state.h | 1 + 2 files changed, 6 insertions(+) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index f8bb5ff2e9ac..4c3a4d5df626 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1562,3 +1562,8 @@ bool nfsd4_run_cb(struct nfsd4_callback *cb) nfsd41_cb_inflight_end(clp); return queued; } + +void nfsd4_kill_callback(struct nfs4_client *clp) +{ + set_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags); +} diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index f42d8d782c84..cde05c26afd8 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -757,6 +757,7 @@ struct nfsd_file *find_any_file(struct nfs4_file *f); #ifdef CONFIG_NFSD_V4 void nfsd4_revoke_states(struct net *net, struct super_block *sb); +void nfsd4_kill_callback(struct nfs4_client *clp); #else static inline void nfsd4_revoke_states(struct net *net, struct super_block *sb) {