This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / md / multipath.c

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index a9df710..3d87901 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -120,7 +120,7 @@ int multipath_end_request(struct bio *bio, unsigned int bytes_done, int error)
 
        if (uptodate)
                multipath_end_bh_io(mp_bh, uptodate);
-       else if ((bio->bi_rw & (1 << BIO_RW_AHEAD)) == 0) {
+       else {
                /*
                 * oops, IO error:
                 */
@@ -130,8 +130,7 @@ int multipath_end_request(struct bio *bio, unsigned int bytes_done, int error)
                       bdevname(rdev->bdev,b), 
                       (unsigned long long)bio->bi_sector);
                multipath_reschedule_retry(mp_bh);
-       } else
-               multipath_end_bh_io(mp_bh, 0);
+       }
        rdev_dec_pending(rdev, conf->mddev);
        return 0;
 }
@@ -383,11 +382,7 @@ static void multipathd (mddev_t *mddev)
                                " to another IO path\n",
                                bdevname(bio->bi_bdev,b),
                                (unsigned long long)bio->bi_sector);
-                       *bio = *(mp_bh->master_bio);
                        bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev;
-                       bio->bi_rw |= (1 << BIO_RW_FAILFAST);
-                       bio->bi_end_io = multipath_end_request;
-                       bio->bi_private = mp_bh;
                        generic_make_request(bio);
                }
        }