From 921ed091ac973f311a586ba30584b5d916137860 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@sw.ru>
Date: Tue, 16 Oct 2007 01:25:02 -0700
Subject: [PATCH] --- yaml --- r: 69631 b: refs/heads/master c:
 8268f5a7415d914fc855a86aa2284ac819dc6b2e h: refs/heads/master i:   69629:
 43a1b0c13e17febf87975dce3044939adf55b38b   69627:
 704658509e0c5eee720043d9d5c7d5d0ff339a3f   69623:
 462d8a6a1ca9443e0eb4945b068134e5586d78bc   69615:
 0e41831f2690db7faf01d256ceff78caca1012f6   69599:
 868bb835eefd582f7a7aa79340a4d155cd701ed0   69567:
 71f1e08ac62603f0c50de9ec0d5385c939acc1be   69503:
 d56e0b6e0d85f85e2c68bc6f68781e2508d7914a   69375:
 91f454e5809be6b787d79ab904060eea35547351   69119:
 a8e79815372c8abafaf7b11e48be2990605b172c   68607:
 55b50b910eceaa64163a1eade6d44ed3fb21e653   67583:
 7d723b3957ba0fa14ccd60f00332d283f39b1ac2   65535:
 9f7407a1ae7917d67e0caeb8494b65a264d36c67 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/loop.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 86eea5dbbd54..552b6466eec0 100644
--- 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
index a5f993ac28dd..e5a051577a5e 100644
--- 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;