From patchwork Sat Feb 1 00:34:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13955975 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 D6D8817C91 for ; Sat, 1 Feb 2025 00:34:51 +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=1738370091; cv=none; b=FFrOBSwiuk3BcMgJf0c7898ThflvSfWHkDiX7XqFJZE9FltbTL7NXYYk5CmQp3VhopKFNXAUK5CwgOblrXRk/9KYtsITo8hS0vl7xNImUtRBw10Hgo3/kWqoc0JH+zf/D0FNHsQn0Gq4QVvBc1mc/AiN6KQVtwfX1bG+uwOnGPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738370091; c=relaxed/simple; bh=VuC02b5yS8ke6mLcq3O5RcDiTMROgA0M5SpWwePwFhw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hj/lUm/hvyeqrdQsZ2qnQU8SZ6tjpBka3HG62ZScCK4XjX28VH0tu7VuOsl2McLoePZybMgvOMduW16O3yX2kNpPACScW/y5Wco7LT9cqQIRcNHK1+mW4cvGuLsmSWr8/Lh0fkf9VLbH17XgbIxJwD2OCX9XvSKNYHJMQ/FioY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z6AD3IAL; 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="Z6AD3IAL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8D44C4CEE4; Sat, 1 Feb 2025 00:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738370091; bh=VuC02b5yS8ke6mLcq3O5RcDiTMROgA0M5SpWwePwFhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z6AD3IALukk0HdYsYyHN5Dpn1JI96f+wbRxuc5KxL8Evd7QN2x0F9fs+8xXbxjp83 xHmNDnneOWEZYgkB4jTVCR5nV1HZo9dPOjhK4Q7SjuxV0Z0O6tXd2ywEl4fNm46x0r 3yhNsWSeprETLV0CvvZy58wajHcwQcn5to7Z56CFtDv4P90JWqkM9NyKKM1d7SsPld 3/yOWVoHbDBSu0D4uGOyVS4bGgkzjmEADtj7kuDjsAuH+H8t1eB7Ng/7HyVsP/uFuA Gcg+4Oo1HXl6CVcw42rvklukonMzTXYJ63/1VVlAUSq+a6w1WkYYBEvkK7tCyKrop6 NR5TnVCtpNhsg== From: cel@kernel.org To: Trond Myklebust , Anna Schumaker Cc: , Chuck Lever , Jeff Layton , Benjamin Coddington , Olga Kornievskaia Subject: [PATCH v4 1/7] NFS: CB_OFFLOAD can return NFS4ERR_DELAY Date: Fri, 31 Jan 2025 19:34:41 -0500 Message-ID: <20250201003447.54614-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250201003447.54614-1-cel@kernel.org> References: <20250201003447.54614-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever RFC 7862 permits the callback service to respond to a CB_OFFLOAD operation with NFS4ERR_DELAY. Use that instead of NFS4ERR_SERVERFAULT for temporary memory allocation failure, as that is more consistent with how other operations report memory allocation failure. Reviewed-by: Jeff Layton Reviewed-by: Benjamin Coddington Reviewed-by: Olga Kornievskaia Tested-by: Olga Kornievskaia Signed-off-by: Chuck Lever --- fs/nfs/callback_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 7832fb0369a1..8397c43358bd 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -718,7 +718,7 @@ __be32 nfs4_callback_offload(void *data, void *dummy, copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL); if (!copy) - return htonl(NFS4ERR_SERVERFAULT); + return cpu_to_be32(NFS4ERR_DELAY); spin_lock(&cps->clp->cl_lock); rcu_read_lock();