From f0546a77e158749c1a5383e06750daba135e1766 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Sat, 3 Apr 2010 17:20:21 +0000
Subject: [PATCH] --- yaml --- r: 189665 b: refs/heads/master c:
 a24e2d7d8f512340991ef0a59cb5d08d491b8e98 h: refs/heads/master i:   189663:
 24c9ab32aedb4b78f138a82c0ffe38bd363ba511 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/cifssmb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 679102800597..7cc04b29e27e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 810627a013163cd294762d57c0ea2ec055ffe4f6
+refs/heads/master: a24e2d7d8f512340991ef0a59cb5d08d491b8e98
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 7cc7f83e9314..e1f90a3a0162 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -1430,6 +1430,8 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
 	__u32 bytes_sent;
 	__u16 byte_count;
 
+	*nbytes = 0;
+
 	/* cFYI(1, ("write at %lld %d bytes", offset, count));*/
 	if (tcon->ses == NULL)
 		return -ECONNABORTED;
@@ -1512,7 +1514,6 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
 	cifs_stats_inc(&tcon->num_writes);
 	if (rc) {
 		cFYI(1, ("Send error in write = %d", rc));
-		*nbytes = 0;
 	} else {
 		*nbytes = le16_to_cpu(pSMBr->CountHigh);
 		*nbytes = (*nbytes) << 16;