| From stable+bounces-188084-greg=kroah.com@vger.kernel.org Mon Oct 20 14:58:05 2025 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 20 Oct 2025 08:57:39 -0400 |
| Subject: NFSD: Minor cleanup in layoutcommit processing |
| To: stable@vger.kernel.org |
| Cc: Sergey Bashirov <sergeybashirov@gmail.com>, Christoph Hellwig <hch@lst.de>, Chuck Lever <chuck.lever@oracle.com>, Sasha Levin <sashal@kernel.org> |
| Message-ID: <20251020125740.1762043-1-sashal@kernel.org> |
| |
| From: Sergey Bashirov <sergeybashirov@gmail.com> |
| |
| [ 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 <hch@lst.de> |
| Signed-off-by: Sergey Bashirov <sergeybashirov@gmail.com> |
| Signed-off-by: Chuck Lever <chuck.lever@oracle.com> |
| Stable-dep-of: d68886bae76a ("NFSD: Fix last write offset handling in layoutcommit") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/nfsd/nfs4proc.c | 12 +++--------- |
| 1 file changed, 3 insertions(+), 9 deletions(-) |
| |
| --- a/fs/nfsd/nfs4proc.c |
| +++ b/fs/nfsd/nfs4proc.c |
| @@ -1717,18 +1717,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, |
