---

yaml --- r: 188689 b: refs/heads/master c: 79788c6 h: refs/heads/master i: 188687: 26bdcad v: v3
git-mirror · Feb 3, 2010 · b0a30b9 · b0a30b9
1 parent f276453
commit b0a30b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c948992a00d478c17042f4790b7d6b35299cf94
+refs/heads/master: 79788c698b290426320e60374ed1324e4b5c69eb
diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c
@@ -524,9 +524,13 @@ static void writepages_finish(struct ceph_osd_request *req,
 	bytes = le64_to_cpu(op->extent.length);
 
 	if (rc >= 0) {
-		wrote = (bytes + (offset & ~PAGE_CACHE_MASK) + ~PAGE_CACHE_MASK)
-			>> PAGE_CACHE_SHIFT;
-		WARN_ON(wrote != req->r_num_pages);
+		/*
+		 * Assume we wrote the pages we originally sent.  The
+		 * osd might reply with fewer pages if our writeback
+		 * raced with a truncation and was adjusted at the osd,
+		 * so don't believe the reply.
+		 */
+		wrote = req->r_num_pages;
 	} else {
 		wrote = 0;
 		mapping_set_error(mapping, rc);