Commit 5651c8e7 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[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.
parent efb00232
This diff is collapsed.
...@@ -7,6 +7,7 @@ struct multipath_info { ...@@ -7,6 +7,7 @@ struct multipath_info {
int number; int number;
int raid_disk; int raid_disk;
kdev_t dev; kdev_t dev;
struct block_device *bdev;
/* /*
* State bits: * State bits:
...@@ -25,7 +26,7 @@ struct multipath_private_data { ...@@ -25,7 +26,7 @@ struct multipath_private_data {
int working_disks; int working_disks;
mdk_thread_t *thread; mdk_thread_t *thread;
struct multipath_info *spare; struct multipath_info *spare;
md_spinlock_t device_lock; spinlock_t device_lock;
/* buffer pool */ /* buffer pool */
/* buffer_heads that we have pre-allocated have b_pprev -> &freebh /* buffer_heads that we have pre-allocated have b_pprev -> &freebh
...@@ -36,7 +37,7 @@ struct multipath_private_data { ...@@ -36,7 +37,7 @@ struct multipath_private_data {
struct multipath_bh *freer1; struct multipath_bh *freer1;
int freer1_blocked; int freer1_blocked;
int freer1_cnt; int freer1_cnt;
md_wait_queue_head_t wait_buffer; wait_queue_head_t wait_buffer;
}; };
typedef struct multipath_private_data multipath_conf_t; typedef struct multipath_private_data multipath_conf_t;
...@@ -60,8 +61,8 @@ struct multipath_bh { ...@@ -60,8 +61,8 @@ struct multipath_bh {
int cmd; int cmd;
unsigned long state; unsigned long state;
mddev_t *mddev; mddev_t *mddev;
struct buffer_head *master_bh; struct bio *master_bio;
struct buffer_head bh_req; struct bio *bio;
struct multipath_bh *next_mp; /* next for retry or in free list */ struct multipath_bh *next_mp; /* next for retry or in free list */
}; };
/* bits for multipath_bh.state */ /* bits for multipath_bh.state */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment