From 64dc4412844d167c958d7b2f952ccf21bd8ebac6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jul 2008 14:45:12 -0700
Subject: [PATCH] --- yaml --- r: 107147 b: refs/heads/master c:
 94ad374a0751f40d25e22e036c37f7263569d24c h: refs/heads/master i:   107145:
 37800bbac1da121f4c8e3e2cd81d205288e0eb35   107143:
 a13dd3f5daaa6cf0612dbabc5b9457a01225bd19 v: v3

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

diff --git a/[refs] b/[refs]
index f614b2833e6d..ce8dd81a1a85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0056e65f9e28d83ee1a3fb4f7d0041e838f03c34
+refs/heads/master: 94ad374a0751f40d25e22e036c37f7263569d24c
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 42bbc6909ba4..d97d1ad55473 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1879,7 +1879,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
 		 * The !iov->iov_len check ensures we skip over unlikely
 		 * zero-length segments (without overruning the iovec).
 		 */
-		while (bytes || unlikely(!iov->iov_len && i->count)) {
+		while (bytes || unlikely(i->count && !iov->iov_len)) {
 			int copy;
 
 			copy = min(bytes, iov->iov_len - base);