[PATCH] bio_unmap_user(): original bio passed in

With the recent bio mapping changes, the caller must pass in the
original bio for unmapping again (and they do). So kill this dead code,
it could cause problems in situations where someone has used bi_private
for something else.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/bio.c b/fs/bio.c
index 063c597a77cfe5b4e8d314a9e4b890c664f21ab8..27c17b329fc919ab94e13ca446f38fadf9a7f11e 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -603,18 +603,6 @@ static void __bio_unmap_user(struct bio *bio)
        struct bio_vec *bvec;
        int i;
 
-       /*
-        * find original bio if it was bounced
-        */
-       if (bio->bi_private) {
-               /*
-                * someone stole our bio, must not happen
-                */
-               BUG_ON(!bio_flagged(bio, BIO_BOUNCED));
-       
-               bio = bio->bi_private;
-       }
-
        /*
         * make sure we dirty pages we wrote to
         */