diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /drivers/md/linear.h | |
| parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
| parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
| download | linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2 linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'drivers/md/linear.h')
| -rw-r--r-- | drivers/md/linear.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/md/linear.h b/drivers/md/linear.h index 0ce29b61605a..b685ddd7d7f7 100644 --- a/drivers/md/linear.h +++ b/drivers/md/linear.h @@ -2,20 +2,14 @@ #define _LINEAR_H struct dev_info { - mdk_rdev_t *rdev; + struct md_rdev *rdev; sector_t end_sector; }; -typedef struct dev_info dev_info_t; - -struct linear_private_data +struct linear_conf { - sector_t array_sectors; - dev_info_t disks[0]; struct rcu_head rcu; + sector_t array_sectors; + struct dev_info disks[0]; }; - - -typedef struct linear_private_data linear_conf_t; - #endif |