From dafa8a2c62324ccc2a60a3f0ca17e7ad43c04889 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 30 Oct 2008 20:15:22 +0000
Subject: [PATCH] --- yaml --- r: 118392 b: refs/heads/master c:
 61de800d33af585cb7e6f27b5cdd51029c6855cb h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/cifssmb.c   | 2 +-
 trunk/fs/cifs/file.c      | 2 +-
 trunk/fs/cifs/transport.c | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d97fabd265a4..cee982175e7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edf1ae403896cb7750800508b14996ba6be39a53
+refs/heads/master: 61de800d33af585cb7e6f27b5cdd51029c6855cb
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 843a85fb8b9a..d5eac48fc415 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -1536,7 +1536,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
 	__u32 bytes_sent;
 	__u16 byte_count;
 
-	/* cFYI(1,("write at %lld %d bytes",offset,count));*/
+	/* cFYI(1, ("write at %lld %d bytes", offset, count));*/
 	if (tcon->ses == NULL)
 		return -ECONNABORTED;
 
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 62d8bd8f14c0..ead1a3bb0256 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -1824,7 +1824,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
 	pTcon = cifs_sb->tcon;
 
 	pagevec_init(&lru_pvec, 0);
-		cFYI(DBG2, ("rpages: num pages %d", num_pages));
+	cFYI(DBG2, ("rpages: num pages %d", num_pages));
 	for (i = 0; i < num_pages; ) {
 		unsigned contig_pages;
 		struct page *tmp_page;
diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index ba4d66644ebf..ff8243a8fe3e 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/fs/cifs/transport.c
@@ -290,8 +290,11 @@ smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec,
 		if (rc < 0)
 			break;
 
-		if (rc >= total_len) {
-			WARN_ON(rc > total_len);
+		if (rc == total_len) {
+			total_len = 0;
+			break;
+		} else if (rc > total_len) {
+			cERROR(1, ("sent %d requested %d", rc, total_len));
 			break;
 		}
 		if (rc == 0) {