---

yaml --- r: 69631 b: refs/heads/master c: 8268f5a h: refs/heads/master i: 69629: 43a1b0c 69627: 7046585 69623: 462d8a6 69615: 0e41831 69599: 868bb83 69567: 71f1e08 69503: d56e0b6 69375: 91f454e 69119: a8e7981 68607: 55b50b9 67583: 7d723b3 65535: 9f7407a v: v3
git-mirror · Oct 16, 2007 · 921ed09 · 921ed09
1 parent df5f313
commit 921ed09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afddba49d18f346e5cc2938b6ed7c512db18ca68
+refs/heads/master: 8268f5a7415d914fc855a86aa2284ac819dc6b2e
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
@@ -245,10 +245,8 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
 
 		ret = pagecache_write_end(file, mapping, pos, size, copied,
 							page, fsdata);
-		if (ret < 0)
+		if (ret < 0 || ret != copied)
 			goto fail;
-		if (ret < copied)
-			copied = ret;
 
 		if (unlikely(transfer_result))
 			goto fail;