diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/md/multipath.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/md/multipath.h')
| -rw-r--r-- | drivers/md/multipath.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/md/multipath.h b/drivers/md/multipath.h index 6fa70b400cda..d1c2a8d78395 100644 --- a/drivers/md/multipath.h +++ b/drivers/md/multipath.h | |||
| @@ -19,12 +19,6 @@ struct multipath_private_data { | |||
| 19 | typedef struct multipath_private_data multipath_conf_t; | 19 | typedef struct multipath_private_data multipath_conf_t; |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * this is the only point in the RAID code where we violate | ||
| 23 | * C type safety. mddev->private is an 'opaque' pointer. | ||
| 24 | */ | ||
| 25 | #define mddev_to_conf(mddev) ((multipath_conf_t *) mddev->private) | ||
| 26 | |||
| 27 | /* | ||
| 28 | * this is our 'private' 'collective' MULTIPATH buffer head. | 22 | * this is our 'private' 'collective' MULTIPATH buffer head. |
| 29 | * it contains information about what kind of IO operations were started | 23 | * it contains information about what kind of IO operations were started |
| 30 | * for this MULTIPATH operation, and about their status: | 24 | * for this MULTIPATH operation, and about their status: |