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 12D7621D3DF for ; Mon, 20 Oct 2025 08:03:12 +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=1760947393; cv=none; b=luyRq6p6NNIC1NBz7gJ8SOHsPw7tz3c+ocHMdXnDeDktvp1pIrOscJjuPdWDjU0eh0WqDxqrdRKcKXsO27H99Wqr2+nk+U7SU2vY6rYxHTeWM3sOyK6Wyx9vTMIXuPsPIg3QUPOUXlPxzmJggbv9VdM9pYBT+oWTFlpspjvvPRo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760947393; c=relaxed/simple; bh=kW3QhER7LX5F+bGpevR9o+0fBEDoPcx+Twk+4UusPvc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=dtqK8zE/Es0/pWcIWZMgBPe/Rbku56veZf/v5Vub8bZeQsfnjSscWQAIzr8W8purfx3bJfTvq4+7MM8vPyj2DWM8yUIrWprCtC12Z6OIt95z9a5q+Z5iXMlfq6kJHaF66SzVsNiCJ7IWdHnySOjsaa1BK1MFZWtBp15w77dzGIs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ErwzwWXX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ErwzwWXX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E397C4CEF9; Mon, 20 Oct 2025 08:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760947392; bh=kW3QhER7LX5F+bGpevR9o+0fBEDoPcx+Twk+4UusPvc=; h=Subject:To:Cc:From:Date:From; b=ErwzwWXX11XctxP8SRf2AHx8TEU0TkyqWppXMd18ZWGILAenbRo4l20xFVl7ocdwH 9hTNGNZOmJ7XjhoK3jjcl/UnNdBEsFnhH6iIgXS6CWOj6FEEf9/3cVte8MGubFXUrp yFIwusZ0ZWirvydIT5nbewr82930KzuCNG4krPGU= Subject: FAILED: patch "[PATCH] NFSD: Define a proc_layoutcommit for the FlexFiles layout" failed to apply to 5.4-stable tree To: chuck.lever@oracle.com,loghyr@hammerspace.com,rtm@csail.mit.edu Cc: From: Date: Mon, 20 Oct 2025 10:03:09 +0200 Message-ID: <2025102009-buckskin-tweet-87b7@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 4b47a8601b71ad98833b447d465592d847b4dc77 # git commit -s git send-email --to '' --in-reply-to '2025102009-buckskin-tweet-87b7@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4b47a8601b71ad98833b447d465592d847b4dc77 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 11 Sep 2025 11:12:06 -0400 Subject: [PATCH] NFSD: Define a proc_layoutcommit for the FlexFiles layout type Avoid a crash if a pNFS client should happen to send a LAYOUTCOMMIT operation on a FlexFiles layout. Reported-by: Robert Morris Closes: https://lore.kernel.org/linux-nfs/152f99b2-ba35-4dec-93a9-4690e625dccd@oracle.com/T/#t Cc: Thomas Haynes Cc: stable@vger.kernel.org Fixes: 9b9960a0ca47 ("nfsd: Add a super simple flex file server") Signed-off-by: Chuck Lever diff --git a/fs/nfsd/flexfilelayout.c b/fs/nfsd/flexfilelayout.c index c318cf74e388..0f1a35400cd5 100644 --- a/fs/nfsd/flexfilelayout.c +++ b/fs/nfsd/flexfilelayout.c @@ -125,6 +125,13 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp, return 0; } +static __be32 +nfsd4_ff_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp, + struct nfsd4_layoutcommit *lcp) +{ + return nfs_ok; +} + const struct nfsd4_layout_ops ff_layout_ops = { .notify_types = NOTIFY_DEVICEID4_DELETE | NOTIFY_DEVICEID4_CHANGE, @@ -133,4 +140,5 @@ const struct nfsd4_layout_ops ff_layout_ops = { .encode_getdeviceinfo = nfsd4_ff_encode_getdeviceinfo, .proc_layoutget = nfsd4_ff_proc_layoutget, .encode_layoutget = nfsd4_ff_encode_layoutget, + .proc_layoutcommit = nfsd4_ff_proc_layoutcommit, };