From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B585F393DEE; Fri, 22 May 2026 12:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779452960; cv=none; b=RVy3JGPGw1rJOdxMygQRu4t32lVfcNJx4Z+skWLFNpJuof22QJ+Hp2hUfANPMty7zlazasXfBb57omo03mRP5lZhF10YpN2+eYyCYssap+C4EU3Y6KQGWPXFA46b7nGB/t9ux7u5MTRpWQVMVHle02O0nITNrbW12GokjNuDodU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779452960; c=relaxed/simple; bh=z1IAS0dOzP5h/+agcTRSLuoAeWW9RbzY4nCWCh5mwMI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VlFnO2bVB3d7s6Wl6T1jFI3pZ1ULylxFvNcUBD4ufcbmN60WpZIesy9VOxwI5raORsQPBcZrjr9CkzKhAOYzvY5QqVO0z1X/VpNMFQHH1TDyizb93cops4cjad4TmFa9JwDEX88ypY5EXJx3njSGH/MJa/wd+IXJmVf20xbWvmE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HUG+ZSMr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HUG+ZSMr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F6001F000E9; Fri, 22 May 2026 12:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779452959; bh=yfKc4GvlDUZVKTDf5ZDFEDag7Qqh0lwgFrnvTVJtlBk=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=HUG+ZSMr/9oQiKMWWJEoX7LEEsXaMa0zFvk1M5eSEviMdpnwWkTQkpVNcS+DEJt8g M5Z0K2oipF55HJqo20jilqAYBAocQ7a9M4RoHtheWQtgc39zXIg8xshuloamvwCgaJ faRsaWWlPPqWqLqB8WmZmUMAt1dWl9pOMWtn1/6C48lcpAij1yzER5WwVmN00TknGb AIX/C4Ek3UZCuqX3Hffkv3I7L2HsaqGjm/HRxo+59gi15PQryu4Vfu1P/XG2an4+5o fUwJoIDNrqaoYCHtqEDx8tjkS0fG0ZFw2DoRDRr2a7VOTtO0bQ5eNY5HVE1imyrPT0 +ojYCeVGP6odg== From: Jeff Layton Date: Fri, 22 May 2026 08:28:55 -0400 Subject: [PATCH v4 06/21] nfsd: make nfsd4_callback_ops->prepare operation bool return Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260522-dir-deleg-v4-6-2acb883ac6bc@kernel.org> References: <20260522-dir-deleg-v4-0-2acb883ac6bc@kernel.org> In-Reply-To: <20260522-dir-deleg-v4-0-2acb883ac6bc@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: Alexander Aring , Amir Goldstein , Jan Kara , Alexander Viro , Christian Brauner , Calum Mackay , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3301; i=jlayton@kernel.org; h=from:subject:message-id; bh=z1IAS0dOzP5h/+agcTRSLuoAeWW9RbzY4nCWCh5mwMI=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqEEwOVelK4Shz5MZ1EgkR9pUo7PZ0ksD3Jey+B thTRiWXlU2JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahBMDgAKCRAADmhBGVaC FchcD/9Tjqo82kodTub/91fSnT67Gb2D39ktZ3wydGx5WS8MPb1ChQ9gSsPSMXYzpc3xbjbvU3U +YzJwzV8cSu0f7NkJxta6wACW5/nxLLHSQ5W52UOJG4hgmboOxEFfiI0dBvMkM5qLRWGHb8lJ9a 1Kd/r2ZG0VDovzGCV2x0szhTn5yGKn0L5yUX84hZIL5jbEutPliJ3ch9a6XaV3ZXYE736H7oRGj lx5sFSuwtyOciLC2Bswblv+0NoUYcqbh7KLuq2QfQcVuGe+tXsp8oZC3GPrsoQQY6K63I+aEhKP dFs8Qx3KzBwn+n6Fb1njw42BioMjbMTVE2zQpaOJOK6h+0kvfujQrvrfp9mIUuuS/13fLhV63z2 yNmwh5q6+zvyYfscJibbAW4hVkwSc1MkesNO1/YT4zD2ifEYNI1FCQN/cUGRTYoBYopkyoIsn1l en2nBkBqzYEEF1emTR5zlzw5EyOnmyxA6DjAj65cMbPABz3U3qcRaxbUBEg43jIV6rS5w7Qr6aQ Ztz4cRMuzg2RB18ZQXTqqVtc9oo1gL3tY8eh8U9a9jJJ8AP/MWnGWiyABtoy+U0ADKxSNYRn8QL rJ5K5ZJ11Mdhm1wmBPTkfA1aZW3PmPWr7KjhpjNEdT9WRFNV9Z5+AGtA0TTJnQLjmPa0VziXMpq fjK+0cTs+giCeYw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 For a CB_NOTIFY operation, we need to stop processing the callback if an allocation fails. Change the ->prepare callback operation to return true if processing should continue, and false otherwise. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 5 ++++- fs/nfsd/nfs4layouts.c | 3 ++- fs/nfsd/nfs4state.c | 6 ++++-- fs/nfsd/state.h | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 50827405468d..25bbf5b8814d 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1715,7 +1715,10 @@ nfsd4_run_cb_work(struct work_struct *work) if (!test_and_clear_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags)) { if (cb->cb_ops && cb->cb_ops->prepare) - cb->cb_ops->prepare(cb); + if (!cb->cb_ops->prepare(cb)) { + nfsd41_destroy_cb(cb); + return; + } } cb->cb_msg.rpc_cred = clp->cl_cb_cred; diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index f34320e4c2f4..e3984c90792e 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -652,7 +652,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls, struct nfsd_file *file) } } -static void +static bool nfsd4_cb_layout_prepare(struct nfsd4_callback *cb) { struct nfs4_layout_stateid *ls = @@ -661,6 +661,7 @@ nfsd4_cb_layout_prepare(struct nfsd4_callback *cb) mutex_lock(&ls->ls_mutex); nfs4_inc_and_copy_stateid(&ls->ls_recall_sid, &ls->ls_stid); mutex_unlock(&ls->ls_mutex); + return true; } static int diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f559ce4422da..beb6e95a1e4d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -357,12 +357,13 @@ remove_blocked_locks(struct nfs4_lockowner *lo) } } -static void +static bool nfsd4_cb_notify_lock_prepare(struct nfsd4_callback *cb) { struct nfsd4_blocked_lock *nbl = container_of(cb, struct nfsd4_blocked_lock, nbl_cb); locks_delete_block(&nbl->nbl_lock); + return true; } static int @@ -5561,7 +5562,7 @@ bool nfsd_wait_for_delegreturn(struct svc_rqst *rqstp, struct inode *inode) return timeo > 0; } -static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) +static bool nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) { struct nfs4_delegation *dp = cb_to_delegation(cb); struct nfsd_net *nn = net_generic(dp->dl_stid.sc_client->net, @@ -5582,6 +5583,7 @@ static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) list_add_tail(&dp->dl_recall_lru, &nn->del_recall_lru); } spin_unlock(&nn->deleg_lock); + return true; } static int nfsd4_cb_recall_done(struct nfsd4_callback *cb, diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index dec83e92650d..e1c40f8b5d01 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -98,9 +98,9 @@ struct nfsd4_callback { }; struct nfsd4_callback_ops { - void (*prepare)(struct nfsd4_callback *); - int (*done)(struct nfsd4_callback *, struct rpc_task *); - void (*release)(struct nfsd4_callback *); + bool (*prepare)(struct nfsd4_callback *cb); + int (*done)(struct nfsd4_callback *cb, struct rpc_task *task); + void (*release)(struct nfsd4_callback *cb); uint32_t opcode; }; -- 2.54.0