Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
	arch/x86/kernel/setup_percpu.c
	arch/x86/mm/fault.c
	drivers/acpi/processor_idle.c
	kernel/irq/handle.c

1 files changed, 15 insertions, 11 deletions

diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 77ebc3c263d6..549b0144da11 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -140,7 +140,6 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
 
         iv = bip_vec_idx(bip, bip->bip_vcnt);
         BUG_ON(iv == NULL);
-        BUG_ON(iv->bv_page != NULL);
 
         iv->bv_page = page;
         iv->bv_len = len;
@@ -465,7 +464,7 @@ static int bio_integrity_verify(struct bio *bio)
 
                 if (ret) {
                         kunmap_atomic(kaddr, KM_USER0);
-                        break;
+                        return ret;
                 }
 
                 sectors = bv->bv_len / bi->sector_size;
@@ -493,18 +492,13 @@ static void bio_integrity_verify_fn(struct work_struct *work)
         struct bio_integrity_payload *bip =
                 container_of(work, struct bio_integrity_payload, bip_work);
         struct bio *bio = bip->bip_bio;
-        int error = bip->bip_error;
+        int error;
 
-        if (bio_integrity_verify(bio)) {
-                clear_bit(BIO_UPTODATE, &bio->bi_flags);
-                error = -EIO;
-        }
+        error = bio_integrity_verify(bio);
 
         /* Restore original bio completion handler */
         bio->bi_end_io = bip->bip_end_io;
-
-        if (bio->bi_end_io)
-                bio->bi_end_io(bio, error);
+        bio_endio(bio, error);
 }
 
 /**
@@ -525,7 +519,17 @@ void bio_integrity_endio(struct bio *bio, int error)
 
         BUG_ON(bip->bip_bio != bio);
 
-        bip->bip_error = error;
+        /* In case of an I/O error there is no point in verifying the
+         * integrity metadata.  Restore original bio end_io handler
+         * and run it.
+         */
+        if (error) {
+                bio->bi_end_io = bip->bip_end_io;
+                bio_endio(bio, error);
+
+                return;
+        }
+
         INIT_WORK(&bip->bip_work, bio_integrity_verify_fn);
         queue_work(kintegrityd_wq, &bip->bip_work);
 }