diff --git a/[refs] b/[refs]
index d72b485488bd..e157df0be865 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae0b77811d97552b3b3c745e97de18849583bf7
+refs/heads/master: b0cfbd995d091b10841eeb948976f5d1fbf13cdd
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index b573607b7112..c11418dd94e8 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1954,7 +1954,9 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 				if (unlikely(nr_segs > 1)) {
 					filemap_set_next_iovec(&cur_iov,
 							&iov_base, status);
-					buf = cur_iov->iov_base + iov_base;
+					if (count)
+						buf = cur_iov->iov_base +
+							iov_base;
 				} else {
 					iov_base += status;
 				}