diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2002-07-18 19:06:46 -0700 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@fys.uio.no> | 2002-07-18 19:06:46 -0700 |
| commit | 8e2a19e732d3d0f90cf425304c2c88c2b478db74 (patch) | |
| tree | fd1a993c3a2950a4b4a460d019a62a7793185c12 | |
| parent | e18a7e5c12d40e8a9efce05b1f3f4a56dbc06917 (diff) | |
[PATCH] MD - 27 - Remove state field from multipath mp_bh structure.
Remove state field from multipath mp_bh structure.
The MPBH_Uptodate flag is set but never used,
The MPBH_SyncPhase flag was never used.
These a both legacy from the copying of raid1.c
MPBH_PreAlloc is no longer needed as due to use of
mempools, so the state field can go...
| -rw-r--r-- | drivers/md/multipath.c | 19 | ||||
| -rw-r--r-- | include/linux/raid/multipath.h | 5 |
2 files changed, 1 insertions, 23 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index ad5e8199bb0c..3e05cfaa9153 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c @@ -130,24 +130,6 @@ void multipath_end_request(struct bio *bio) int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); struct multipath_bh * mp_bh = (struct multipath_bh *)(bio->bi_private); - /* - * this branch is our 'one multipath IO has finished' event handler: - */ - if (!uptodate) - md_error (mp_bh->mddev, bio->bi_bdev); - else - /* - * Set MPBH_Uptodate in our master buffer_head, so that - * we will return a good error code for to the higher - * levels even if IO on some other multipathed buffer fails. - * - * The 'master' represents the complex operation to - * user-side. So if something waits for IO, then it will - * wait for the 'master' buffer_head. - */ - set_bit (MPBH_Uptodate, &mp_bh->state); - - if (uptodate) { multipath_end_bh_io(mp_bh, uptodate); return; @@ -155,6 +137,7 @@ void multipath_end_request(struct bio *bio) /* * oops, IO error: */ + md_error (mp_bh->mddev, bio->bi_bdev); printk(KERN_ERR "multipath: %s: rescheduling sector %lu\n", bdev_partition_name(bio->bi_bdev), bio->bi_sector); multipath_reschedule_retry(mp_bh); diff --git a/include/linux/raid/multipath.h b/include/linux/raid/multipath.h index 657eb913adba..f34b54b83767 100644 --- a/include/linux/raid/multipath.h +++ b/include/linux/raid/multipath.h @@ -49,14 +49,9 @@ struct multipath_bh { * used from IRQ handlers */ int cmd; - unsigned long state; mddev_t *mddev; struct bio *master_bio; struct bio *bio; struct multipath_bh *next_mp; /* next for retry or in free list */ }; -/* bits for multipath_bh.state */ -#define MPBH_Uptodate 1 -#define MPBH_SyncPhase 2 -#define MPBH_PreAlloc 3 /* this was pre-allocated, add to free list */ #endif |