Hi all,
Today's linux-next merge of the vfs-brauner-fixes tree got a conflict in:
fs/smb/client/smb2pdu.c
between commit:
92941c7f2c95 ("smb: fix bytes written value in /proc/fs/cifs/Stats")
from Linus' tree and commit:
4acb665cf4f3 ("netfs: Work around recursion by abandoning retry if nothing read")
from the vfs-brauner-fixes tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/smb/client/smb2pdu.c
index 959359301250,458b53d1f9cb..000000000000
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@@ -4840,12 -4841,12 +4841,14 @@@ smb2_writev_callback(struct mid_q_entr
if (written > wdata->subreq.len)
written &= 0xFFFF;
+ cifs_stats_bytes_written(tcon, written);
+
- if (written < wdata->subreq.len)
+ if (written < wdata->subreq.len) {
wdata->result = -ENOSPC;
- else
+ } else if (written > 0) {
wdata->subreq.len = written;
+ __set_bit(NETFS_SREQ_MADE_PROGRESS, &wdata->subreq.flags);
+ }
break;
case MID_REQUEST_SUBMITTED:
case MID_RETRY_NEEDED:
Attachment:
pgpN0RQ8_ifYJ.pgp
Description: OpenPGP digital signature
