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;