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 0F3FA2737E7; Tue, 21 Oct 2025 19:56:15 +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=1761076575; cv=none; b=ECErNzo0dDoaYjZFCpyE9nn7576rz9vuJEb9nVn94qUfZYm7GDATS154VLMw/0z+2Ria+ipWZPJdnMBtpZkg49SrjaROcYWc1zwqJvhHBBRqoOtsRmndcBaxgnUKPQDr4Q1y/irzuqhumh9Re9lVuFiKNgfIxsz9l4QBwBpAQZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761076575; c=relaxed/simple; bh=Ae1dAnnUX+dARl/Jl7zdR/M2XCSGaiigr/l9Ei3Ljxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=reozKANXQIlqgwVkcY+M0lyeQHoXv9/khlYM6zVpGvGDkh/+tHKneYAtxuinkvLiX/rgxkDMgkE3jiNlM5PMMx0oDei0WjvCIJ6+87cGBkg/dXkjrFdNeaU7x5jxAsgfeR/sTMiOfgI5Du11Ky9e6EICCynT0nGeVo5KtFHdTg0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wZZceJ9u; 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="wZZceJ9u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FFE5C4CEF1; Tue, 21 Oct 2025 19:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761076574; bh=Ae1dAnnUX+dARl/Jl7zdR/M2XCSGaiigr/l9Ei3Ljxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wZZceJ9ucYQGQ2tmdxP7+MkG4SneGeFDqNUaz3lII7kY4ZDzxsQtn3psRiD0/74Ib VcfaenoF17LzfXrfy5+Xcm+DSiIv49CJb7QnE4nvkI3AKXOMgLi9JRerqOO/j4Jovt yOxMr9bLf0+DOT0zULz/APRc4O6OcjG2cbc0RNn8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Sergey Bashirov , Chuck Lever , Sasha Levin Subject: [PATCH 6.6 077/105] NFSD: Minor cleanup in layoutcommit processing Date: Tue, 21 Oct 2025 21:51:26 +0200 Message-ID: <20251021195023.480331427@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251021195021.492915002@linuxfoundation.org> References: <20251021195021.492915002@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sergey Bashirov [ Upstream commit 274365a51d88658fb51cca637ba579034e90a799 ] Remove dprintk in nfsd4_layoutcommit. These are not needed in day to day usage, and the information is also available in Wireshark when capturing NFS traffic. Reviewed-by: Christoph Hellwig Signed-off-by: Sergey Bashirov Signed-off-by: Chuck Lever Stable-dep-of: d68886bae76a ("NFSD: Fix last write offset handling in layoutcommit") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4proc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2325,18 +2325,12 @@ nfsd4_layoutcommit(struct svc_rqst *rqst inode = d_inode(current_fh->fh_dentry); nfserr = nfserr_inval; - if (new_size <= seg->offset) { - dprintk("pnfsd: last write before layout segment\n"); + if (new_size <= seg->offset) goto out; - } - if (new_size > seg->offset + seg->length) { - dprintk("pnfsd: last write beyond layout segment\n"); + if (new_size > seg->offset + seg->length) goto out; - } - if (!lcp->lc_newoffset && new_size > i_size_read(inode)) { - dprintk("pnfsd: layoutcommit beyond EOF\n"); + if (!lcp->lc_newoffset && new_size > i_size_read(inode)) goto out; - } nfserr = nfsd4_preprocess_layout_stateid(rqstp, cstate, &lcp->lc_sid, false, lcp->lc_layout_type,