From d74e155d535328e11a5702c31db00c021a5bcd63 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Thu, 31 Dec 2009 12:04:58 -0800
Subject: [PATCH] --- yaml --- r: 188674 b: refs/heads/master c:
 6a4ef48103a78a46b80e07fcd8ac4edda0c7128f h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/ceph/file.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b2f8c085861c..4248570ba978 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93cea5bebf91319095db866163a7e35c3e77d8f2
+refs/heads/master: 6a4ef48103a78a46b80e07fcd8ac4edda0c7128f
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
index fc8aff4767d3..2d88c805a56c 100644
--- a/trunk/fs/ceph/file.c
+++ b/trunk/fs/ceph/file.c
@@ -350,10 +350,10 @@ static int copy_user_to_page_vector(struct page **pages,
 			return -EFAULT;
 		data += l - bad;
 		left -= l - bad;
-		if (po) {
-			po += l - bad;
-			if (po == PAGE_CACHE_SIZE)
-				po = 0;
+		po += l - bad;
+		if (po == PAGE_CACHE_SIZE) {
+			po = 0;
+			i++;
 		}
 	}
 	return len;