From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 61CC73B8955; Tue, 7 Apr 2026 13:22:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775568163; cv=none; b=rr0hCj81Q7SHdnMKtE1w+njAndNB4EmwD5qbFlGhfMh5rYXr8Bb0CFO9e2dX/szZBXxNNcbSKiEVWd/hUcx2DkYPzm57pDkCm9wv8wLE7GL+w2J/QIja7bCUxlzH1mBfS63ghQMo3l1/Exocq82tTP0wONCeRBWpx0pr1nhDFw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775568163; c=relaxed/simple; bh=nd+D7JHwqvtqus2IrGozp20RqKgFY4Lczm6Ea+egZkM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a83F8ry6zk3SYwothJqzuuOWZZXBYllHr0S8Wix4tAxUE/QQJ1rcpcPs7zjw7QzL998IFIadGr6FkDYlfFNmGKaq6qHrkNHey0vkpVXTukbqbdi8H1hb3rUcgG1937aNPKrZp2QfQL1QiZ5PSZG+8ubkSh3o0u8ritQYXZ8tfOg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I9P3o+JX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I9P3o+JX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CA9CC2BCB3; Tue, 7 Apr 2026 13:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775568163; bh=nd+D7JHwqvtqus2IrGozp20RqKgFY4Lczm6Ea+egZkM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=I9P3o+JXZWPZ/DTmHCW2Vf6hiYoG3tPiHVrIsFR+SdEsCKHlLjzq26w5oRTqm9hGN 1xJcF+byZPIq/EO5ibrH+jnqlzP1EF5EIUHKWtGG3k+Dr0P50NjajzTzEKC/X0qJx8 ankkW+p3KnyKjaBWV2Cr5LktmUF9R9hinarEETBMWZVfZrpypiLFUlljkEuAaZ3yAh I0Ai4GL0bGnuXYig8UmV4kFgxyV9XQMjG+41GIioRSTp9B5MpPEpA1pEvNWmtH/P1O jLddwaac/NE6uwwIFufFLf9G6+htwUthvUSahzfOBgJk6b3i5QLCkSlL6wsx6lyv1u HcINqKeNOmTNA== From: Jeff Layton Date: Tue, 07 Apr 2026 09:21:22 -0400 Subject: [PATCH 09/24] 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: <20260407-dir-deleg-v1-9-aaf68c478abd@kernel.org> References: <20260407-dir-deleg-v1-0-aaf68c478abd@kernel.org> In-Reply-To: <20260407-dir-deleg-v1-0-aaf68c478abd@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Chuck Lever , Alexander Aring , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Amir Goldstein Cc: Calum Mackay , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-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=nd+D7JHwqvtqus2IrGozp20RqKgFY4Lczm6Ea+egZkM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp1QUGYR4StIUmqXHYQ8LsRuehLLuNekfLhQJlv jtxN0K4/qGJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCadUFBgAKCRAADmhBGVaC FZKRD/9uXvtVIhYr54EY5zXd6T+Gdlz3VOubDXk35HryRF03Bbj9nB3/AgiDlw3j4ImF/r7bwzd N+vOEml1BWWZMFTe6MWpzqTm9hJtVp38VNLWG8g49NKACSbUxsJwdFatjowvWwhC61H+PlrYB7M ErbBVJQLOr7Nz5BOJD5/saTzbo3AUHQ9K1ANwhB1GCjxr7z6i/EkGLNaB9MUJPburkhK+X2Ao3l csa3/wwcKcEb8V2xWXnUqdZ+/K4ROZmWmA/7TeDT/I1MxosU8cbUQu9u9XkPkaT5Lbc/wzyl9iy 7NwRbNSHwbg8YKYkXcr907Ju2CsU4Kzs5nSc9E6merCUeNJOyxcU05svudBE2GlUWLFbmdwqeUw 2PfxMBEHnH6FL4am3zEbcNlX28GEgVXKi1Sdatkxrb/IzFE3fAZEvsZSLMH6hcrl5aOw6nrA804 wjecIOckBxyCxvQHMeNII0SLKrvIvMxEtfuaHaMyZCdcIhXZU+xe71J8NM24ODS2XcDl9Wp7Eo2 +xLm7JHezp8kO8Snoq5lXINWfz9qEs1xUqH3CXgznZ3Zst13TSyClH+fBPL4mpaHAhCYQ76+w6K mRGYJLDbRUIQG02c5UiGxnGgNgpwFIBX8goOeBkFE6TzfVo4AekTVjrOntxp5YCKklzrmKmKDDZ KysNvESejl9oiBg== 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 c550b83f4432..8974e3d85d75 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -654,7 +654,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 = @@ -663,6 +663,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 9a4cff08c67d..fd3d7cd427e1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -355,12 +355,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 @@ -5538,7 +5539,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, @@ -5559,6 +5560,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 811c148f36fc..7d2afe7dcc3e 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.53.0