diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/md/multipath.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/md/multipath.h')
| -rw-r--r-- | drivers/md/multipath.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/multipath.h b/drivers/md/multipath.h index d1c2a8d78395..3c5a45eb5f8a 100644 --- a/drivers/md/multipath.h +++ b/drivers/md/multipath.h | |||
| @@ -9,7 +9,6 @@ struct multipath_private_data { | |||
| 9 | mddev_t *mddev; | 9 | mddev_t *mddev; |
| 10 | struct multipath_info *multipaths; | 10 | struct multipath_info *multipaths; |
| 11 | int raid_disks; | 11 | int raid_disks; |
| 12 | int working_disks; | ||
| 13 | spinlock_t device_lock; | 12 | spinlock_t device_lock; |
| 14 | struct list_head retry_list; | 13 | struct list_head retry_list; |
| 15 | 14 | ||