From 480fac8bd0d735bb96676e62b2f365f972cd70db Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 16 Oct 2007 01:24:54 -0700
Subject: [PATCH] --- yaml --- r: 69620 b: refs/heads/master c:
 4b49643fbb3fa8bf4910f82be02d45e94e8972a4 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/filemap.c | 9 +--------
 trunk/mm/filemap.h | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 49e8143d1d08..8f13516a4770 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41cb8ac025dbbf6782eae10d231e7e2336ad3724
+refs/heads/master: 4b49643fbb3fa8bf4910f82be02d45e94e8972a4
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index c504db18ac26..caaaa7adfdf9 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1895,12 +1895,6 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 			break;
 		}
 
-		if (unlikely(bytes == 0)) {
-			status = 0;
-			copied = 0;
-			goto zero_length_segment;
-		}
-
 		status = a_ops->prepare_write(file, page, offset, offset+bytes);
 		if (unlikely(status)) {
 			loff_t isize = i_size_read(inode);
@@ -1930,8 +1924,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 			page_cache_release(page);
 			continue;
 		}
-zero_length_segment:
-		if (likely(copied >= 0)) {
+		if (likely(copied > 0)) {
 			if (!status)
 				status = copied;
 
diff --git a/trunk/mm/filemap.h b/trunk/mm/filemap.h
index c2bff04c84ed..a1e10a232e92 100644
--- a/trunk/mm/filemap.h
+++ b/trunk/mm/filemap.h
@@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iovec **iovp, size_t *basep, size_t bytes)
 	const struct iovec *iov = *iovp;
 	size_t base = *basep;
 
-	do {
+	while (bytes) {
 		int copy = min(bytes, iov->iov_len - base);
 
 		bytes -= copy;
@@ -96,7 +96,7 @@ filemap_set_next_iovec(const struct iovec **iovp, size_t *basep, size_t bytes)
 			iov++;
 			base = 0;
 		}
-	} while (bytes);
+	}
 	*iovp = iov;
 	*basep = base;
 }