Merge branch 'master' into for-2.6.31

[firefly-linux-kernel-4.4.55.git] / fs / bio.c

diff --git a/fs/bio.c b/fs/bio.c
index 98711647ece49548a94409a99ce4b680ee085ca1..81dc93e72535f299b8df7687a2cfa818fcbe4d00 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1201,7 +1201,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
                char *addr = page_address(bvec->bv_page);
                int len = bmd->iovecs[i].bv_len;
 
-               if (read && !err)
+               if (read)
                        memcpy(p, addr, len);
 
                __free_page(bvec->bv_page);