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 F3E152D542A; Mon, 27 Oct 2025 19:07:54 +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=1761592075; cv=none; b=dh+cqmBQ7ngKX7RRb0TaZc2bEH6++dA14xpXr5WD1NWMQ5Da21KdVuAz4MlcDWAXR/k8hDZJUJxELTBeBEO3ehqW+QVWXZl9ZcAc4ZssyXqz/Id2cnxzCh9jdSj5K1sZgHrOlBeTEgufX+IHnizv4bQ+5jAzqHN/QdVrxBHR34M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592075; c=relaxed/simple; bh=kdVOVYyhw6g/77dl45RB4MD7T3GLf64EUr51Aq7Gh4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G8gLpOaK4tlWsPZEylha4EsXnB9OT/2VPehgt6o7isopT7BrUqH7jWEaSE5YYnmgZLmbuS1ml/MzNEaS4cBd2nNSYRb/7tULvemwkySmfu3ZX2q1nirqHnWhhjMyquM7bt93YZAutFqvsmkHdJQ/dYt0VdK5vBdw8dGMacPCopQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VSxQxBOU; 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="VSxQxBOU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 826F4C4CEF1; Mon, 27 Oct 2025 19:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761592074; bh=kdVOVYyhw6g/77dl45RB4MD7T3GLf64EUr51Aq7Gh4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VSxQxBOUZJuZk/o0lMC0I5FdXaQ1k+Pnxgy8ZG8uAcDSFq7Q6EGLklvOwvhsFKfui AhRn/LgDqwBRms4Kf1gfiQlSraopokCQ0lAXY/y7qHE9dSkouCtMYXzRvGS+cNjItD Q2qMgnyBY5N/iZoEbdPPMxQQoQI7yqiuNBDXC1XQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Robert Morris , Thomas Haynes , Chuck Lever , Sasha Levin Subject: [PATCH 5.15 108/123] NFSD: Define a proc_layoutcommit for the FlexFiles layout type Date: Mon, 27 Oct 2025 19:36:28 +0100 Message-ID: <20251027183449.281959633@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183446.381986645@linuxfoundation.org> References: <20251027183446.381986645@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever [ Upstream commit 4b47a8601b71ad98833b447d465592d847b4dc77 ] 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 [ removed struct svc_rqst parameter from nfsd4_ff_proc_layoutcommit ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/flexfilelayout.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/nfsd/flexfilelayout.c +++ b/fs/nfsd/flexfilelayout.c @@ -125,6 +125,13 @@ nfsd4_ff_proc_getdeviceinfo(struct super return 0; } +static __be32 +nfsd4_ff_proc_layoutcommit(struct inode *inode, + 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_ .encode_getdeviceinfo = nfsd4_ff_encode_getdeviceinfo, .proc_layoutget = nfsd4_ff_proc_layoutget, .encode_layoutget = nfsd4_ff_encode_layoutget, + .proc_layoutcommit = nfsd4_ff_proc_layoutcommit, };