Skip to contentSkip to conversation

FAILED: patch "[PATCH] CIFS: Do not consider -ENODATA as stat failure for reads" failed to apply to 4.20-stable tree

PATCH [email protected] 1 participant 1 message Feb 2, 2019 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.20-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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 082aaa8700415f6471ec9c5ef0c8307ca214989a Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <[email protected]>
Date: Fri, 18 Jan 2019 15:54:34 -0800
Subject: [PATCH] CIFS: Do not consider -ENODATA as stat failure for reads

When doing reads beyound the end of a file the server returns error STATUS_END_OF_FILE error which is mapped to -ENODATA. Currently we report it as a failure which confuses read stats. Change it to not consider -ENODATA as failure for stat purposes.

fs/cifs/smb2pdu.c +1 -1
index d858dc04fdc3..ef52d6642431 100644
@@ -3241,7 +3241,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
 		rdata->mr = NULL;
 	}
 #endif
-	if (rdata->result) {
+	if (rdata->result && rdata->result != -ENODATA) {
 		cifs_stats_fail_inc(tcon, SMB2_READ_HE);
 		trace_smb3_read_err(0 /* xid */,
 				    rdata->cfile->fid.persistent_fid,