diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-04-24 23:50:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-24 23:50:10 -0700 |
| commit | 5651c8e7a2d5af7e9f60a17c1236e9dec5411372 (patch) | |
| tree | d72e3ee81b55419ffde05fa8b601c8ff414e7f2e /include/linux/raid | |
| parent | efb0023262a442fd5bd2b443f8431c10c5e08fb0 (diff) | |
[PATCH] (7/15) big struct block_device * push (first series)
- md/multipath.c convert to bio, compile fixes, bring struct
block_device * into private data.
Diffstat (limited to 'include/linux/raid')
| -rw-r--r-- | include/linux/raid/multipath.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/raid/multipath.h b/include/linux/raid/multipath.h index 261c1c837d7b..9c9cdc77fa05 100644 --- a/include/linux/raid/multipath.h +++ b/include/linux/raid/multipath.h @@ -7,6 +7,7 @@ struct multipath_info { int number; int raid_disk; kdev_t dev; + struct block_device *bdev; /* * State bits: @@ -25,7 +26,7 @@ struct multipath_private_data { int working_disks; mdk_thread_t *thread; struct multipath_info *spare; - md_spinlock_t device_lock; + spinlock_t device_lock; /* buffer pool */ /* buffer_heads that we have pre-allocated have b_pprev -> &freebh @@ -36,7 +37,7 @@ struct multipath_private_data { struct multipath_bh *freer1; int freer1_blocked; int freer1_cnt; - md_wait_queue_head_t wait_buffer; + wait_queue_head_t wait_buffer; }; typedef struct multipath_private_data multipath_conf_t; @@ -60,8 +61,8 @@ struct multipath_bh { int cmd; unsigned long state; mddev_t *mddev; - struct buffer_head *master_bh; - struct buffer_head bh_req; + struct bio *master_bio; + struct bio *bio; struct multipath_bh *next_mp; /* next for retry or in free list */ }; /* bits for multipath_bh.state */ |