Skip to content

L
linux
Commit fd01b88c authored by NeilBrown's avatar NeilBrown
Browse files
Options

md: remove typedefs: mddev_t -> struct mddev 

Having mddev_t and 'struct mddev_s' is ugly and not preferred
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 3cb03002
Hide whitespace changes
Inline Side-by-side
Showing with 417 additions and 420 deletions
drivers/md/bitmap.c
View file @ fd01b88c
...@@ -179,7 +179,7 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) ...@@ -179,7 +179,7 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
*/ */
/* IO operations when bitmap is stored near all superblocks */ /* IO operations when bitmap is stored near all superblocks */
static struct page *read_sb_page(mddev_t *mddev, loff_t offset, static struct page *read_sb_page(struct mddev *mddev, loff_t offset,
struct page *page, struct page *page,
unsigned long index, int size) unsigned long index, int size)
{ {
...@@ -218,7 +218,7 @@ static struct page *read_sb_page(mddev_t *mddev, loff_t offset, ...@@ -218,7 +218,7 @@ static struct page *read_sb_page(mddev_t *mddev, loff_t offset,
} }
static struct md_rdev *next_active_rdev(struct md_rdev *rdev, mddev_t *mddev) static struct md_rdev *next_active_rdev(struct md_rdev *rdev, struct mddev *mddev)
{ {
/* Iterate the disks of an mddev, using rcu to protect access to the /* Iterate the disks of an mddev, using rcu to protect access to the
* linked list, and raising the refcount of devices we return to ensure * linked list, and raising the refcount of devices we return to ensure
...@@ -256,7 +256,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) ...@@ -256,7 +256,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
{ {
struct md_rdev *rdev = NULL; struct md_rdev *rdev = NULL;
struct block_device *bdev; struct block_device *bdev;
mddev_t *mddev = bitmap->mddev; struct mddev *mddev = bitmap->mddev;
while ((rdev = next_active_rdev(rdev, mddev)) != NULL) { while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
int size = PAGE_SIZE; int size = PAGE_SIZE;
...@@ -1157,7 +1157,7 @@ static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap, ...@@ -1157,7 +1157,7 @@ static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,
* out to disk * out to disk
*/ */
void bitmap_daemon_work(mddev_t *mddev) void bitmap_daemon_work(struct mddev *mddev)
{ {
struct bitmap *bitmap; struct bitmap *bitmap;
unsigned long j; unsigned long j;
...@@ -1647,7 +1647,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) ...@@ -1647,7 +1647,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e)
/* /*
* flush out any pending updates * flush out any pending updates
*/ */
void bitmap_flush(mddev_t *mddev) void bitmap_flush(struct mddev *mddev)
{ {
struct bitmap *bitmap = mddev->bitmap; struct bitmap *bitmap = mddev->bitmap;
long sleep; long sleep;
...@@ -1695,7 +1695,7 @@ static void bitmap_free(struct bitmap *bitmap) ...@@ -1695,7 +1695,7 @@ static void bitmap_free(struct bitmap *bitmap)
kfree(bitmap); kfree(bitmap);
} }
void bitmap_destroy(mddev_t *mddev) void bitmap_destroy(struct mddev *mddev)
{ {
struct bitmap *bitmap = mddev->bitmap; struct bitmap *bitmap = mddev->bitmap;
...@@ -1718,7 +1718,7 @@ void bitmap_destroy(mddev_t *mddev) ...@@ -1718,7 +1718,7 @@ void bitmap_destroy(mddev_t *mddev)
* initialize the bitmap structure * initialize the bitmap structure
* if this returns an error, bitmap_destroy must be called to do clean up * if this returns an error, bitmap_destroy must be called to do clean up
*/ */
int bitmap_create(mddev_t *mddev) int bitmap_create(struct mddev *mddev)
{ {
struct bitmap *bitmap; struct bitmap *bitmap;
sector_t blocks = mddev->resync_max_sectors; sector_t blocks = mddev->resync_max_sectors;
...@@ -1822,7 +1822,7 @@ int bitmap_create(mddev_t *mddev) ...@@ -1822,7 +1822,7 @@ int bitmap_create(mddev_t *mddev)
return err; return err;
} }
int bitmap_load(mddev_t *mddev) int bitmap_load(struct mddev *mddev)
{ {
int err = 0; int err = 0;
sector_t start = 0; sector_t start = 0;
...@@ -1868,7 +1868,7 @@ int bitmap_load(mddev_t *mddev) ...@@ -1868,7 +1868,7 @@ int bitmap_load(mddev_t *mddev)
EXPORT_SYMBOL_GPL(bitmap_load); EXPORT_SYMBOL_GPL(bitmap_load);
static ssize_t static ssize_t
location_show(mddev_t *mddev, char *page) location_show(struct mddev *mddev, char *page)
{ {
ssize_t len; ssize_t len;
if (mddev->bitmap_info.file) if (mddev->bitmap_info.file)
...@@ -1882,7 +1882,7 @@ location_show(mddev_t *mddev, char *page) ...@@ -1882,7 +1882,7 @@ location_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
location_store(mddev_t *mddev, const char *buf, size_t len) location_store(struct mddev *mddev, const char *buf, size_t len)
{ {
if (mddev->pers) { if (mddev->pers) {
...@@ -1959,7 +1959,7 @@ static struct md_sysfs_entry bitmap_location = ...@@ -1959,7 +1959,7 @@ static struct md_sysfs_entry bitmap_location =
__ATTR(location, S_IRUGO|S_IWUSR, location_show, location_store); __ATTR(location, S_IRUGO|S_IWUSR, location_show, location_store);
static ssize_t static ssize_t
timeout_show(mddev_t *mddev, char *page) timeout_show(struct mddev *mddev, char *page)
{ {
ssize_t len; ssize_t len;
unsigned long secs = mddev->bitmap_info.daemon_sleep / HZ; unsigned long secs = mddev->bitmap_info.daemon_sleep / HZ;
...@@ -1973,7 +1973,7 @@ timeout_show(mddev_t *mddev, char *page) ...@@ -1973,7 +1973,7 @@ timeout_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
timeout_store(mddev_t *mddev, const char *buf, size_t len) timeout_store(struct mddev *mddev, const char *buf, size_t len)
{ {
/* timeout can be set at any time */ /* timeout can be set at any time */
unsigned long timeout; unsigned long timeout;
...@@ -2009,13 +2009,13 @@ static struct md_sysfs_entry bitmap_timeout = ...@@ -2009,13 +2009,13 @@ static struct md_sysfs_entry bitmap_timeout =
__ATTR(time_base, S_IRUGO|S_IWUSR, timeout_show, timeout_store); __ATTR(time_base, S_IRUGO|S_IWUSR, timeout_show, timeout_store);
static ssize_t static ssize_t
backlog_show(mddev_t *mddev, char *page) backlog_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%lu\n", mddev->bitmap_info.max_write_behind); return sprintf(page, "%lu\n", mddev->bitmap_info.max_write_behind);
} }
static ssize_t static ssize_t
backlog_store(mddev_t *mddev, const char *buf, size_t len) backlog_store(struct mddev *mddev, const char *buf, size_t len)
{ {
unsigned long backlog; unsigned long backlog;
int rv = strict_strtoul(buf, 10, &backlog); int rv = strict_strtoul(buf, 10, &backlog);
...@@ -2031,13 +2031,13 @@ static struct md_sysfs_entry bitmap_backlog = ...@@ -2031,13 +2031,13 @@ static struct md_sysfs_entry bitmap_backlog =
__ATTR(backlog, S_IRUGO|S_IWUSR, backlog_show, backlog_store); __ATTR(backlog, S_IRUGO|S_IWUSR, backlog_show, backlog_store);
static ssize_t static ssize_t
chunksize_show(mddev_t *mddev, char *page) chunksize_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%lu\n", mddev->bitmap_info.chunksize); return sprintf(page, "%lu\n", mddev->bitmap_info.chunksize);
} }
static ssize_t static ssize_t
chunksize_store(mddev_t *mddev, const char *buf, size_t len) chunksize_store(struct mddev *mddev, const char *buf, size_t len)
{ {
/* Can only be changed when no bitmap is active */ /* Can only be changed when no bitmap is active */
int rv; int rv;
...@@ -2057,13 +2057,13 @@ chunksize_store(mddev_t *mddev, const char *buf, size_t len) ...@@ -2057,13 +2057,13 @@ chunksize_store(mddev_t *mddev, const char *buf, size_t len)
static struct md_sysfs_entry bitmap_chunksize = static struct md_sysfs_entry bitmap_chunksize =
__ATTR(chunksize, S_IRUGO|S_IWUSR, chunksize_show, chunksize_store); __ATTR(chunksize, S_IRUGO|S_IWUSR, chunksize_show, chunksize_store);
static ssize_t metadata_show(mddev_t *mddev, char *page) static ssize_t metadata_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%s\n", (mddev->bitmap_info.external return sprintf(page, "%s\n", (mddev->bitmap_info.external
? "external" : "internal")); ? "external" : "internal"));
} }
static ssize_t metadata_store(mddev_t *mddev, const char *buf, size_t len) static ssize_t metadata_store(struct mddev *mddev, const char *buf, size_t len)
{ {
if (mddev->bitmap || if (mddev->bitmap ||
mddev->bitmap_info.file || mddev->bitmap_info.file ||
...@@ -2081,7 +2081,7 @@ static ssize_t metadata_store(mddev_t *mddev, const char *buf, size_t len) ...@@ -2081,7 +2081,7 @@ static ssize_t metadata_store(mddev_t *mddev, const char *buf, size_t len)
static struct md_sysfs_entry bitmap_metadata = static struct md_sysfs_entry bitmap_metadata =
__ATTR(metadata, S_IRUGO|S_IWUSR, metadata_show, metadata_store); __ATTR(metadata, S_IRUGO|S_IWUSR, metadata_show, metadata_store);
static ssize_t can_clear_show(mddev_t *mddev, char *page) static ssize_t can_clear_show(struct mddev *mddev, char *page)
{ {
int len; int len;
if (mddev->bitmap) if (mddev->bitmap)
...@@ -2092,7 +2092,7 @@ static ssize_t can_clear_show(mddev_t *mddev, char *page) ...@@ -2092,7 +2092,7 @@ static ssize_t can_clear_show(mddev_t *mddev, char *page)
return len; return len;
} }
static ssize_t can_clear_store(mddev_t *mddev, const char *buf, size_t len) static ssize_t can_clear_store(struct mddev *mddev, const char *buf, size_t len)
{ {
if (mddev->bitmap == NULL) if (mddev->bitmap == NULL)
return -ENOENT; return -ENOENT;
...@@ -2111,7 +2111,7 @@ static struct md_sysfs_entry bitmap_can_clear = ...@@ -2111,7 +2111,7 @@ static struct md_sysfs_entry bitmap_can_clear =
__ATTR(can_clear, S_IRUGO|S_IWUSR, can_clear_show, can_clear_store); __ATTR(can_clear, S_IRUGO|S_IWUSR, can_clear_show, can_clear_store);
static ssize_t static ssize_t
behind_writes_used_show(mddev_t *mddev, char *page) behind_writes_used_show(struct mddev *mddev, char *page)
{ {
if (mddev->bitmap == NULL) if (mddev->bitmap == NULL)
return sprintf(page, "0\n"); return sprintf(page, "0\n");
...@@ -2120,7 +2120,7 @@ behind_writes_used_show(mddev_t *mddev, char *page) ...@@ -2120,7 +2120,7 @@ behind_writes_used_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
behind_writes_used_reset(mddev_t *mddev, const char *buf, size_t len) behind_writes_used_reset(struct mddev *mddev, const char *buf, size_t len)
{ {
if (mddev->bitmap) if (mddev->bitmap)
mddev->bitmap->behind_writes_used = 0; mddev->bitmap->behind_writes_used = 0;
......
drivers/md/bitmap.h
View file @ fd01b88c
...@@ -193,7 +193,7 @@ struct bitmap { ...@@ -193,7 +193,7 @@ struct bitmap {
unsigned long pages; /* total number of pages in the bitmap */ unsigned long pages; /* total number of pages in the bitmap */
unsigned long missing_pages; /* number of pages not yet allocated */ unsigned long missing_pages; /* number of pages not yet allocated */
mddev_t *mddev; /* the md device that the bitmap is for */ struct mddev *mddev; /* the md device that the bitmap is for */
/* bitmap chunksize -- how much data does each bit represent? */ /* bitmap chunksize -- how much data does each bit represent? */
unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */ unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */
...@@ -238,10 +238,10 @@ struct bitmap { ...@@ -238,10 +238,10 @@ struct bitmap {
/* the bitmap API */ /* the bitmap API */
/* these are used only by md/bitmap */ /* these are used only by md/bitmap */
int bitmap_create(mddev_t *mddev); int bitmap_create(struct mddev *mddev);
int bitmap_load(mddev_t *mddev); int bitmap_load(struct mddev *mddev);
void bitmap_flush(mddev_t *mddev); void bitmap_flush(struct mddev *mddev);
void bitmap_destroy(mddev_t *mddev); void bitmap_destroy(struct mddev *mddev);
void bitmap_print_sb(struct bitmap *bitmap); void bitmap_print_sb(struct bitmap *bitmap);
void bitmap_update_sb(struct bitmap *bitmap); void bitmap_update_sb(struct bitmap *bitmap);
...@@ -262,7 +262,7 @@ void bitmap_close_sync(struct bitmap *bitmap); ...@@ -262,7 +262,7 @@ void bitmap_close_sync(struct bitmap *bitmap);
void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector); void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector);
void bitmap_unplug(struct bitmap *bitmap); void bitmap_unplug(struct bitmap *bitmap);
void bitmap_daemon_work(mddev_t *mddev); void bitmap_daemon_work(struct mddev *mddev);
#endif #endif
#endif #endif
drivers/md/dm-raid.c
View file @ fd01b88c
...@@ -57,7 +57,7 @@ struct raid_set { ...@@ -57,7 +57,7 @@ struct raid_set {
uint64_t print_flags; uint64_t print_flags;
struct mddev_s md; struct mddev md;
struct raid_type *raid_type; struct raid_type *raid_type;
struct dm_target_callbacks callbacks; struct dm_target_callbacks callbacks;
...@@ -611,7 +611,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) ...@@ -611,7 +611,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size)
return 0; return 0;
} }
static void super_sync(mddev_t *mddev, struct md_rdev *rdev) static void super_sync(struct mddev *mddev, struct md_rdev *rdev)
{ {
struct md_rdev *r, *t; struct md_rdev *r, *t;
uint64_t failed_devices; uint64_t failed_devices;
...@@ -689,7 +689,7 @@ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev) ...@@ -689,7 +689,7 @@ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev)
return (events_sb > events_refsb) ? 1 : 0; return (events_sb > events_refsb) ? 1 : 0;
} }
static int super_init_validation(mddev_t *mddev, struct md_rdev *rdev) static int super_init_validation(struct mddev *mddev, struct md_rdev *rdev)
{ {
int role; int role;
struct raid_set *rs = container_of(mddev, struct raid_set, md); struct raid_set *rs = container_of(mddev, struct raid_set, md);
...@@ -809,7 +809,7 @@ static int super_init_validation(mddev_t *mddev, struct md_rdev *rdev) ...@@ -809,7 +809,7 @@ static int super_init_validation(mddev_t *mddev, struct md_rdev *rdev)
return 0; return 0;
} }
static int super_validate(mddev_t *mddev, struct md_rdev *rdev) static int super_validate(struct mddev *mddev, struct md_rdev *rdev)
{ {
struct dm_raid_superblock *sb = page_address(rdev->sb_page); struct dm_raid_superblock *sb = page_address(rdev->sb_page);
...@@ -850,7 +850,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) ...@@ -850,7 +850,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
{ {
int ret; int ret;
struct md_rdev *rdev, *freshest, *tmp; struct md_rdev *rdev, *freshest, *tmp;
mddev_t *mddev = &rs->md; struct mddev *mddev = &rs->md;
freshest = NULL; freshest = NULL;
rdev_for_each(rdev, tmp, mddev) { rdev_for_each(rdev, tmp, mddev) {
...@@ -1004,7 +1004,7 @@ static void raid_dtr(struct dm_target *ti) ...@@ -1004,7 +1004,7 @@ static void raid_dtr(struct dm_target *ti)
static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context) static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context)
{ {
struct raid_set *rs = ti->private; struct raid_set *rs = ti->private;
mddev_t *mddev = &rs->md; struct mddev *mddev = &rs->md;
mddev->pers->make_request(mddev, bio); mddev->pers->make_request(mddev, bio);
......
drivers/md/faulty.c
View file @ fd01b88c
...@@ -169,7 +169,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode) ...@@ -169,7 +169,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode)
conf->nfaults = n+1; conf->nfaults = n+1;
} }
static int make_request(mddev_t *mddev, struct bio *bio) static int make_request(struct mddev *mddev, struct bio *bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int failit = 0; int failit = 0;
...@@ -222,7 +222,7 @@ static int make_request(mddev_t *mddev, struct bio *bio) ...@@ -222,7 +222,7 @@ static int make_request(mddev_t *mddev, struct bio *bio)
} }
} }
static void status(struct seq_file *seq, mddev_t *mddev) static void status(struct seq_file *seq, struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int n; int n;
...@@ -255,7 +255,7 @@ static void status(struct seq_file *seq, mddev_t *mddev) ...@@ -255,7 +255,7 @@ static void status(struct seq_file *seq, mddev_t *mddev)
} }
static int reshape(mddev_t *mddev) static int reshape(struct mddev *mddev)
{ {
int mode = mddev->new_layout & ModeMask; int mode = mddev->new_layout & ModeMask;
int count = mddev->new_layout >> ModeShift; int count = mddev->new_layout >> ModeShift;
...@@ -284,7 +284,7 @@ static int reshape(mddev_t *mddev) ...@@ -284,7 +284,7 @@ static int reshape(mddev_t *mddev)
return 0; return 0;
} }
static sector_t faulty_size(mddev_t *mddev, sector_t sectors, int raid_disks) static sector_t faulty_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
WARN_ONCE(raid_disks, WARN_ONCE(raid_disks,
"%s does not support generic reshape\n", __func__); "%s does not support generic reshape\n", __func__);
...@@ -295,7 +295,7 @@ static sector_t faulty_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -295,7 +295,7 @@ static sector_t faulty_size(mddev_t *mddev, sector_t sectors, int raid_disks)
return sectors; return sectors;
} }
static int run(mddev_t *mddev) static int run(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
int i; int i;
...@@ -325,7 +325,7 @@ static int run(mddev_t *mddev) ...@@ -325,7 +325,7 @@ static int run(mddev_t *mddev)
return 0; return 0;
} }
static int stop(mddev_t *mddev) static int stop(struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
......
drivers/md/linear.c
View file @ fd01b88c
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* /*
* find which device holds a particular offset * find which device holds a particular offset
*/ */
static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector) static inline dev_info_t *which_dev(struct mddev *mddev, sector_t sector)
{ {
int lo, mid, hi; int lo, mid, hi;
linear_conf_t *conf; linear_conf_t *conf;
...@@ -63,7 +63,7 @@ static int linear_mergeable_bvec(struct request_queue *q, ...@@ -63,7 +63,7 @@ static int linear_mergeable_bvec(struct request_queue *q,
struct bvec_merge_data *bvm, struct bvec_merge_data *bvm,
struct bio_vec *biovec) struct bio_vec *biovec)
{ {
mddev_t *mddev = q->queuedata; struct mddev *mddev = q->queuedata;
dev_info_t *dev0; dev_info_t *dev0;
unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9; unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9;
sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
...@@ -89,7 +89,7 @@ static int linear_mergeable_bvec(struct request_queue *q, ...@@ -89,7 +89,7 @@ static int linear_mergeable_bvec(struct request_queue *q,
static int linear_congested(void *data, int bits) static int linear_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
linear_conf_t *conf; linear_conf_t *conf;
int i, ret = 0; int i, ret = 0;
...@@ -108,7 +108,7 @@ static int linear_congested(void *data, int bits) ...@@ -108,7 +108,7 @@ static int linear_congested(void *data, int bits)
return ret; return ret;
} }
static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks) static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
linear_conf_t *conf; linear_conf_t *conf;
sector_t array_sectors; sector_t array_sectors;
...@@ -123,7 +123,7 @@ static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -123,7 +123,7 @@ static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks)
return array_sectors; return array_sectors;
} }
static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks)
{ {
linear_conf_t *conf; linear_conf_t *conf;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -194,7 +194,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) ...@@ -194,7 +194,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
return NULL; return NULL;
} }
static int linear_run (mddev_t *mddev) static int linear_run (struct mddev *mddev)
{ {
linear_conf_t *conf; linear_conf_t *conf;
...@@ -213,7 +213,7 @@ static int linear_run (mddev_t *mddev) ...@@ -213,7 +213,7 @@ static int linear_run (mddev_t *mddev)
return md_integrity_register(mddev); return md_integrity_register(mddev);
} }
static int linear_add(mddev_t *mddev, struct md_rdev *rdev) static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
{ {
/* Adding a drive to a linear array allows the array to grow. /* Adding a drive to a linear array allows the array to grow.
* It is permitted if the new drive has a matching superblock * It is permitted if the new drive has a matching superblock
...@@ -245,7 +245,7 @@ static int linear_add(mddev_t *mddev, struct md_rdev *rdev) ...@@ -245,7 +245,7 @@ static int linear_add(mddev_t *mddev, struct md_rdev *rdev)
return 0; return 0;
} }
static int linear_stop (mddev_t *mddev) static int linear_stop (struct mddev *mddev)
{ {
linear_conf_t *conf = mddev->private; linear_conf_t *conf = mddev->private;
...@@ -264,7 +264,7 @@ static int linear_stop (mddev_t *mddev) ...@@ -264,7 +264,7 @@ static int linear_stop (mddev_t *mddev)
return 0; return 0;
} }
static int linear_make_request (mddev_t *mddev, struct bio *bio) static int linear_make_request (struct mddev *mddev, struct bio *bio)
{ {
dev_info_t *tmp_dev; dev_info_t *tmp_dev;
sector_t start_sector; sector_t start_sector;
...@@ -323,7 +323,7 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio) ...@@ -323,7 +323,7 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio)
return 1; return 1;
} }
static void linear_status (struct seq_file *seq, mddev_t *mddev) static void linear_status (struct seq_file *seq, struct mddev *mddev)
{ {
seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2); seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2);
......
drivers/md/md.c
View file @ fd01b88c
...@@ -95,13 +95,13 @@ static struct workqueue_struct *md_misc_wq; ...@@ -95,13 +95,13 @@ static struct workqueue_struct *md_misc_wq;
static int sysctl_speed_limit_min = 1000; static int sysctl_speed_limit_min = 1000;
static int sysctl_speed_limit_max = 200000; static int sysctl_speed_limit_max = 200000;
static inline int speed_min(mddev_t *mddev) static inline int speed_min(struct mddev *mddev)
{ {
return mddev->sync_speed_min ? return mddev->sync_speed_min ?
mddev->sync_speed_min : sysctl_speed_limit_min; mddev->sync_speed_min : sysctl_speed_limit_min;
} }
static inline int speed_max(mddev_t *mddev) static inline int speed_max(struct mddev *mddev)
{ {
return mddev->sync_speed_max ? return mddev->sync_speed_max ?
mddev->sync_speed_max : sysctl_speed_limit_max; mddev->sync_speed_max : sysctl_speed_limit_max;
...@@ -157,7 +157,7 @@ static int start_readonly; ...@@ -157,7 +157,7 @@ static int start_readonly;
static void mddev_bio_destructor(struct bio *bio) static void mddev_bio_destructor(struct bio *bio)
{ {
mddev_t *mddev, **mddevp; struct mddev *mddev, **mddevp;
mddevp = (void*)bio; mddevp = (void*)bio;
mddev = mddevp[-1]; mddev = mddevp[-1];
...@@ -166,10 +166,10 @@ static void mddev_bio_destructor(struct bio *bio) ...@@ -166,10 +166,10 @@ static void mddev_bio_destructor(struct bio *bio)
} }
struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
mddev_t *mddev) struct mddev *mddev)
{ {
struct bio *b; struct bio *b;
mddev_t **mddevp; struct mddev **mddevp;
if (!mddev || !mddev->bio_set) if (!mddev || !mddev->bio_set)
return bio_alloc(gfp_mask, nr_iovecs); return bio_alloc(gfp_mask, nr_iovecs);
...@@ -186,10 +186,10 @@ struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, ...@@ -186,10 +186,10 @@ struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
EXPORT_SYMBOL_GPL(bio_alloc_mddev); EXPORT_SYMBOL_GPL(bio_alloc_mddev);
struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask, struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,
mddev_t *mddev) struct mddev *mddev)
{ {
struct bio *b; struct bio *b;
mddev_t **mddevp; struct mddev **mddevp;
if (!mddev || !mddev->bio_set) if (!mddev || !mddev->bio_set)
return bio_clone(bio, gfp_mask); return bio_clone(bio, gfp_mask);
...@@ -278,7 +278,7 @@ EXPORT_SYMBOL_GPL(md_trim_bio); ...@@ -278,7 +278,7 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
*/ */
static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters); static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
static atomic_t md_event_count; static atomic_t md_event_count;
void md_new_event(mddev_t *mddev) void md_new_event(struct mddev *mddev)
{ {
atomic_inc(&md_event_count); atomic_inc(&md_event_count);
wake_up(&md_event_waiters); wake_up(&md_event_waiters);
...@@ -288,7 +288,7 @@ EXPORT_SYMBOL_GPL(md_new_event); ...@@ -288,7 +288,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
/* Alternate version that can be called from interrupts /* Alternate version that can be called from interrupts
* when calling sysfs_notify isn't needed. * when calling sysfs_notify isn't needed.
*/ */
static void md_new_event_inintr(mddev_t *mddev) static void md_new_event_inintr(struct mddev *mddev)
{ {
atomic_inc(&md_event_count); atomic_inc(&md_event_count);
wake_up(&md_event_waiters); wake_up(&md_event_waiters);
...@@ -309,19 +309,19 @@ static DEFINE_SPINLOCK(all_mddevs_lock); ...@@ -309,19 +309,19 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
* Any code which breaks out of this loop while own * Any code which breaks out of this loop while own
* a reference to the current mddev and must mddev_put it. * a reference to the current mddev and must mddev_put it.
*/ */
#define for_each_mddev(mddev,tmp) \ #define for_each_mddev(_mddev,_tmp) \
\ \
for (({ spin_lock(&all_mddevs_lock); \ for (({ spin_lock(&all_mddevs_lock); \
tmp = all_mddevs.next; \ _tmp = all_mddevs.next; \
mddev = NULL;}); \ _mddev = NULL;}); \
({ if (tmp != &all_mddevs) \ ({ if (_tmp != &all_mddevs) \
mddev_get(list_entry(tmp, mddev_t, all_mddevs));\ mddev_get(list_entry(_tmp, struct mddev, all_mddevs));\
spin_unlock(&all_mddevs_lock); \ spin_unlock(&all_mddevs_lock); \
if (mddev) mddev_put(mddev); \ if (_mddev) mddev_put(_mddev); \
mddev = list_entry(tmp, mddev_t, all_mddevs); \ _mddev = list_entry(_tmp, struct mddev, all_mddevs); \
tmp != &all_mddevs;}); \ _tmp != &all_mddevs;}); \
({ spin_lock(&all_mddevs_lock); \ ({ spin_lock(&all_mddevs_lock); \
tmp = tmp->next;}) \ _tmp = _tmp->next;}) \
) )
...@@ -335,7 +335,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock); ...@@ -335,7 +335,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
static int md_make_request(struct request_queue *q, struct bio *bio) static int md_make_request(struct request_queue *q, struct bio *bio)
{ {
const int rw = bio_data_dir(bio); const int rw = bio_data_dir(bio);
mddev_t *mddev = q->queuedata; struct mddev *mddev = q->queuedata;
int rv; int rv;
int cpu; int cpu;
unsigned int sectors; unsigned int sectors;
...@@ -387,7 +387,7 @@ static int md_make_request(struct request_queue *q, struct bio *bio) ...@@ -387,7 +387,7 @@ static int md_make_request(struct request_queue *q, struct bio *bio)
* Once ->stop is called and completes, the module will be completely * Once ->stop is called and completes, the module will be completely
* unused. * unused.
*/ */
void mddev_suspend(mddev_t *mddev) void mddev_suspend(struct mddev *mddev)
{ {
BUG_ON(mddev->suspended); BUG_ON(mddev->suspended);
mddev->suspended = 1; mddev->suspended = 1;
...@@ -397,7 +397,7 @@ void mddev_suspend(mddev_t *mddev) ...@@ -397,7 +397,7 @@ void mddev_suspend(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(mddev_suspend); EXPORT_SYMBOL_GPL(mddev_suspend);
void mddev_resume(mddev_t *mddev) void mddev_resume(struct mddev *mddev)
{ {
mddev->suspended = 0; mddev->suspended = 0;
wake_up(&mddev->sb_wait); wake_up(&mddev->sb_wait);
...@@ -408,7 +408,7 @@ void mddev_resume(mddev_t *mddev) ...@@ -408,7 +408,7 @@ void mddev_resume(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(mddev_resume); EXPORT_SYMBOL_GPL(mddev_resume);
int mddev_congested(mddev_t *mddev, int bits) int mddev_congested(struct mddev *mddev, int bits)
{ {
return mddev->suspended; return mddev->suspended;
} }
...@@ -421,7 +421,7 @@ EXPORT_SYMBOL(mddev_congested); ...@@ -421,7 +421,7 @@ EXPORT_SYMBOL(mddev_congested);
static void md_end_flush(struct bio *bio, int err) static void md_end_flush(struct bio *bio, int err)
{ {
struct md_rdev *rdev = bio->bi_private; struct md_rdev *rdev = bio->bi_private;
mddev_t *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
rdev_dec_pending(rdev, mddev); rdev_dec_pending(rdev, mddev);
...@@ -436,7 +436,7 @@ static void md_submit_flush_data(struct work_struct *ws); ...@@ -436,7 +436,7 @@ static void md_submit_flush_data(struct work_struct *ws);
static void submit_flushes(struct work_struct *ws) static void submit_flushes(struct work_struct *ws)
{ {
mddev_t *mddev = container_of(ws, mddev_t, flush_work); struct mddev *mddev = container_of(ws, struct mddev, flush_work);
struct md_rdev *rdev; struct md_rdev *rdev;
INIT_WORK(&mddev->flush_work, md_submit_flush_data); INIT_WORK(&mddev->flush_work, md_submit_flush_data);
...@@ -469,7 +469,7 @@ static void submit_flushes(struct work_struct *ws) ...@@ -469,7 +469,7 @@ static void submit_flushes(struct work_struct *ws)
static void md_submit_flush_data(struct work_struct *ws) static void md_submit_flush_data(struct work_struct *ws)
{ {
mddev_t *mddev = container_of(ws, mddev_t, flush_work); struct mddev *mddev = container_of(ws, struct mddev, flush_work);
struct bio *bio = mddev->flush_bio; struct bio *bio = mddev->flush_bio;
if (bio->bi_size == 0) if (bio->bi_size == 0)
...@@ -485,7 +485,7 @@ static void md_submit_flush_data(struct work_struct *ws) ...@@ -485,7 +485,7 @@ static void md_submit_flush_data(struct work_struct *ws)
wake_up(&mddev->sb_wait); wake_up(&mddev->sb_wait);
} }
void md_flush_request(mddev_t *mddev, struct bio *bio) void md_flush_request(struct mddev *mddev, struct bio *bio)
{ {
spin_lock_irq(&mddev->write_lock); spin_lock_irq(&mddev->write_lock);
wait_event_lock_irq(mddev->sb_wait, wait_event_lock_irq(mddev->sb_wait,
...@@ -509,7 +509,7 @@ EXPORT_SYMBOL(md_flush_request); ...@@ -509,7 +509,7 @@ EXPORT_SYMBOL(md_flush_request);
*/ */
struct md_plug_cb { struct md_plug_cb {
struct blk_plug_cb cb; struct blk_plug_cb cb;
mddev_t *mddev; struct mddev *mddev;
}; };
static void plugger_unplug(struct blk_plug_cb *cb) static void plugger_unplug(struct blk_plug_cb *cb)
...@@ -523,7 +523,7 @@ static void plugger_unplug(struct blk_plug_cb *cb) ...@@ -523,7 +523,7 @@ static void plugger_unplug(struct blk_plug_cb *cb)
/* Check that an unplug wakeup will come shortly. /* Check that an unplug wakeup will come shortly.
* If not, wakeup the md thread immediately * If not, wakeup the md thread immediately
*/ */
int mddev_check_plugged(mddev_t *mddev) int mddev_check_plugged(struct mddev *mddev)
{ {
struct blk_plug *plug = current->plug; struct blk_plug *plug = current->plug;
struct md_plug_cb *mdcb; struct md_plug_cb *mdcb;
...@@ -555,7 +555,7 @@ int mddev_check_plugged(mddev_t *mddev) ...@@ -555,7 +555,7 @@ int mddev_check_plugged(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(mddev_check_plugged); EXPORT_SYMBOL_GPL(mddev_check_plugged);
static inline mddev_t *mddev_get(mddev_t *mddev) static inline struct mddev *mddev_get(struct mddev *mddev)
{ {
atomic_inc(&mddev->active); atomic_inc(&mddev->active);
return mddev; return mddev;
...@@ -563,7 +563,7 @@ static inline mddev_t *mddev_get(mddev_t *mddev) ...@@ -563,7 +563,7 @@ static inline mddev_t *mddev_get(mddev_t *mddev)
static void mddev_delayed_delete(struct work_struct *ws); static void mddev_delayed_delete(struct work_struct *ws);
static void mddev_put(mddev_t *mddev) static void mddev_put(struct mddev *mddev)
{ {
struct bio_set *bs = NULL; struct bio_set *bs = NULL;
...@@ -592,7 +592,7 @@ static void mddev_put(mddev_t *mddev) ...@@ -592,7 +592,7 @@ static void mddev_put(mddev_t *mddev)
bioset_free(bs); bioset_free(bs);
} }
void mddev_init(mddev_t *mddev) void mddev_init(struct mddev *mddev)
{ {
mutex_init(&mddev->open_mutex); mutex_init(&mddev->open_mutex);
mutex_init(&mddev->reconfig_mutex); mutex_init(&mddev->reconfig_mutex);
...@@ -615,9 +615,9 @@ void mddev_init(mddev_t *mddev) ...@@ -615,9 +615,9 @@ void mddev_init(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(mddev_init); EXPORT_SYMBOL_GPL(mddev_init);
static mddev_t * mddev_find(dev_t unit) static struct mddev * mddev_find(dev_t unit)
{ {
mddev_t *mddev, *new = NULL; struct mddev *mddev, *new = NULL;
if (unit && MAJOR(unit) != MD_MAJOR) if (unit && MAJOR(unit) != MD_MAJOR)
unit &= ~((1<<MdpMinorShift)-1); unit &= ~((1<<MdpMinorShift)-1);
...@@ -689,24 +689,24 @@ static mddev_t * mddev_find(dev_t unit) ...@@ -689,24 +689,24 @@ static mddev_t * mddev_find(dev_t unit)
goto retry; goto retry;
} }
static inline int mddev_lock(mddev_t * mddev) static inline int mddev_lock(struct mddev * mddev)
{ {
return mutex_lock_interruptible(&mddev->reconfig_mutex); return mutex_lock_interruptible(&mddev->reconfig_mutex);
} }
static inline int mddev_is_locked(mddev_t *mddev) static inline int mddev_is_locked(struct mddev *mddev)
{ {
return mutex_is_locked(&mddev->reconfig_mutex); return mutex_is_locked(&mddev->reconfig_mutex);
} }
static inline int mddev_trylock(mddev_t * mddev) static inline int mddev_trylock(struct mddev * mddev)
{ {
return mutex_trylock(&mddev->reconfig_mutex); return mutex_trylock(&mddev->reconfig_mutex);
} }
static struct attribute_group md_redundancy_group; static struct attribute_group md_redundancy_group;
static void mddev_unlock(mddev_t * mddev) static void mddev_unlock(struct mddev * mddev)
{ {
if (mddev->to_remove) { if (mddev->to_remove) {
/* These cannot be removed under reconfig_mutex as /* These cannot be removed under reconfig_mutex as
...@@ -749,7 +749,7 @@ static void mddev_unlock(mddev_t * mddev) ...@@ -749,7 +749,7 @@ static void mddev_unlock(mddev_t * mddev)
spin_unlock(&pers_lock); spin_unlock(&pers_lock);
} }
static struct md_rdev * find_rdev_nr(mddev_t *mddev, int nr) static struct md_rdev * find_rdev_nr(struct mddev *mddev, int nr)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -760,7 +760,7 @@ static struct md_rdev * find_rdev_nr(mddev_t *mddev, int nr) ...@@ -760,7 +760,7 @@ static struct md_rdev * find_rdev_nr(mddev_t *mddev, int nr)
return NULL; return NULL;
} }
static struct md_rdev * find_rdev(mddev_t * mddev, dev_t dev) static struct md_rdev * find_rdev(struct mddev * mddev, dev_t dev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -823,7 +823,7 @@ static void free_disk_sb(struct md_rdev * rdev) ...@@ -823,7 +823,7 @@ static void free_disk_sb(struct md_rdev * rdev)
static void super_written(struct bio *bio, int error) static void super_written(struct bio *bio, int error)
{ {
struct md_rdev *rdev = bio->bi_private; struct md_rdev *rdev = bio->bi_private;
mddev_t *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
if (error || !test_bit(BIO_UPTODATE, &bio->bi_flags)) { if (error || !test_bit(BIO_UPTODATE, &bio->bi_flags)) {
printk("md: super_written gets error=%d, uptodate=%d\n", printk("md: super_written gets error=%d, uptodate=%d\n",
...@@ -837,7 +837,7 @@ static void super_written(struct bio *bio, int error) ...@@ -837,7 +837,7 @@ static void super_written(struct bio *bio, int error)
bio_put(bio); bio_put(bio);
} }
void md_super_write(mddev_t *mddev, struct md_rdev *rdev, void md_super_write(struct mddev *mddev, struct md_rdev *rdev,
sector_t sector, int size, struct page *page) sector_t sector, int size, struct page *page)
{ {
/* write first size bytes of page to sector of rdev /* write first size bytes of page to sector of rdev
...@@ -858,7 +858,7 @@ void md_super_write(mddev_t *mddev, struct md_rdev *rdev, ...@@ -858,7 +858,7 @@ void md_super_write(mddev_t *mddev, struct md_rdev *rdev,
submit_bio(WRITE_FLUSH_FUA, bio); submit_bio(WRITE_FLUSH_FUA, bio);
} }
void md_super_wait(mddev_t *mddev) void md_super_wait(struct mddev *mddev)
{ {
/* wait for all superblock writes that were scheduled to complete */ /* wait for all superblock writes that were scheduled to complete */
DEFINE_WAIT(wq); DEFINE_WAIT(wq);
...@@ -1021,13 +1021,13 @@ static unsigned int calc_sb_csum(mdp_super_t * sb) ...@@ -1021,13 +1021,13 @@ static unsigned int calc_sb_csum(mdp_super_t * sb)
* -EINVAL superblock incompatible or invalid * -EINVAL superblock incompatible or invalid
* -othererror e.g. -EIO * -othererror e.g. -EIO
* *
* int validate_super(mddev_t *mddev, struct md_rdev *dev) * int validate_super(struct mddev *mddev, struct md_rdev *dev)
* Verify that dev is acceptable into mddev. * Verify that dev is acceptable into mddev.
* The first time, mddev->raid_disks will be 0, and data from * The first time, mddev->raid_disks will be 0, and data from
* dev should be merged in. Subsequent calls check that dev * dev should be merged in. Subsequent calls check that dev
* is new enough. Return 0 or -EINVAL * is new enough. Return 0 or -EINVAL
* *
* void sync_super(mddev_t *mddev, struct md_rdev *dev) * void sync_super(struct mddev *mddev, struct md_rdev *dev)
* Update the superblock for rdev with data in mddev * Update the superblock for rdev with data in mddev
* This does not write to disc. * This does not write to disc.
* *
...@@ -1038,8 +1038,8 @@ struct super_type { ...@@ -1038,8 +1038,8 @@ struct super_type {
struct module *owner; struct module *owner;
int (*load_super)(struct md_rdev *rdev, struct md_rdev *refdev, int (*load_super)(struct md_rdev *rdev, struct md_rdev *refdev,
int minor_version); int minor_version);
int (*validate_super)(mddev_t *mddev, struct md_rdev *rdev); int (*validate_super)(struct mddev *mddev, struct md_rdev *rdev);
void (*sync_super)(mddev_t *mddev, struct md_rdev *rdev); void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
unsigned long long (*rdev_size_change)(struct md_rdev *rdev, unsigned long long (*rdev_size_change)(struct md_rdev *rdev,
sector_t num_sectors); sector_t num_sectors);
}; };
...@@ -1052,7 +1052,7 @@ struct super_type { ...@@ -1052,7 +1052,7 @@ struct super_type {
* has a bitmap. Otherwise, it returns 0. * has a bitmap. Otherwise, it returns 0.
* *
*/ */
int md_check_no_bitmap(mddev_t *mddev) int md_check_no_bitmap(struct mddev *mddev)
{ {
if (!mddev->bitmap_info.file && !mddev->bitmap_info.offset) if (!mddev->bitmap_info.file && !mddev->bitmap_info.offset)
return 0; return 0;
...@@ -1160,7 +1160,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor ...@@ -1160,7 +1160,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor
/* /*
* validate_super for 0.90.0 * validate_super for 0.90.0
*/ */
static int super_90_validate(mddev_t *mddev, struct md_rdev *rdev) static int super_90_validate(struct mddev *mddev, struct md_rdev *rdev)
{ {
mdp_disk_t *desc; mdp_disk_t *desc;
mdp_super_t *sb = page_address(rdev->sb_page); mdp_super_t *sb = page_address(rdev->sb_page);
...@@ -1272,7 +1272,7 @@ static int super_90_validate(mddev_t *mddev, struct md_rdev *rdev) ...@@ -1272,7 +1272,7 @@ static int super_90_validate(mddev_t *mddev, struct md_rdev *rdev)
/* /*
* sync_super for 0.90.0 * sync_super for 0.90.0
*/ */
static void super_90_sync(mddev_t *mddev, struct md_rdev *rdev) static void super_90_sync(struct mddev *mddev, struct md_rdev *rdev)
{ {
mdp_super_t *sb; mdp_super_t *sb;
struct md_rdev *rdev2; struct md_rdev *rdev2;
...@@ -1622,7 +1622,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ ...@@ -1622,7 +1622,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
return ret; return ret;
} }
static int super_1_validate(mddev_t *mddev, struct md_rdev *rdev) static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
{ {
struct mdp_superblock_1 *sb = page_address(rdev->sb_page); struct mdp_superblock_1 *sb = page_address(rdev->sb_page);
__u64 ev1 = le64_to_cpu(sb->events); __u64 ev1 = le64_to_cpu(sb->events);
...@@ -1723,7 +1723,7 @@ static int super_1_validate(mddev_t *mddev, struct md_rdev *rdev) ...@@ -1723,7 +1723,7 @@ static int super_1_validate(mddev_t *mddev, struct md_rdev *rdev)
return 0; return 0;
} }
static void super_1_sync(mddev_t *mddev, struct md_rdev *rdev) static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
{ {
struct mdp_superblock_1 *sb; struct mdp_superblock_1 *sb;
struct md_rdev *rdev2; struct md_rdev *rdev2;
...@@ -1902,7 +1902,7 @@ static struct super_type super_types[] = { ...@@ -1902,7 +1902,7 @@ static struct super_type super_types[] = {
}, },
}; };
static void sync_super(mddev_t *mddev, struct md_rdev *rdev) static void sync_super(struct mddev *mddev, struct md_rdev *rdev)
{ {
if (mddev->sync_super) { if (mddev->sync_super) {
mddev->sync_super(mddev, rdev); mddev->sync_super(mddev, rdev);
...@@ -1914,7 +1914,7 @@ static void sync_super(mddev_t *mddev, struct md_rdev *rdev) ...@@ -1914,7 +1914,7 @@ static void sync_super(mddev_t *mddev, struct md_rdev *rdev)
super_types[mddev->major_version].sync_super(mddev, rdev); super_types[mddev->major_version].sync_super(mddev, rdev);
} }
static int match_mddev_units(mddev_t *mddev1, mddev_t *mddev2) static int match_mddev_units(struct mddev *mddev1, struct mddev *mddev2)
{ {
struct md_rdev *rdev, *rdev2; struct md_rdev *rdev, *rdev2;
...@@ -1939,7 +1939,7 @@ static LIST_HEAD(pending_raid_disks); ...@@ -1939,7 +1939,7 @@ static LIST_HEAD(pending_raid_disks);
* from the array. It only succeeds if all working and active component devices * from the array. It only succeeds if all working and active component devices
* are integrity capable with matching profiles. * are integrity capable with matching profiles.
*/ */
int md_integrity_register(mddev_t *mddev) int md_integrity_register(struct mddev *mddev)
{ {
struct md_rdev *rdev, *reference = NULL; struct md_rdev *rdev, *reference = NULL;
...@@ -1986,7 +1986,7 @@ int md_integrity_register(mddev_t *mddev) ...@@ -1986,7 +1986,7 @@ int md_integrity_register(mddev_t *mddev)
EXPORT_SYMBOL(md_integrity_register); EXPORT_SYMBOL(md_integrity_register);
/* Disable data integrity if non-capable/non-matching disk is being added */ /* Disable data integrity if non-capable/non-matching disk is being added */
void md_integrity_add_rdev(struct md_rdev *rdev, mddev_t *mddev) void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev)
{ {
struct blk_integrity *bi_rdev = bdev_get_integrity(rdev->bdev); struct blk_integrity *bi_rdev = bdev_get_integrity(rdev->bdev);
struct blk_integrity *bi_mddev = blk_get_integrity(mddev->gendisk); struct blk_integrity *bi_mddev = blk_get_integrity(mddev->gendisk);
...@@ -2003,7 +2003,7 @@ void md_integrity_add_rdev(struct md_rdev *rdev, mddev_t *mddev) ...@@ -2003,7 +2003,7 @@ void md_integrity_add_rdev(struct md_rdev *rdev, mddev_t *mddev)
} }
EXPORT_SYMBOL(md_integrity_add_rdev); EXPORT_SYMBOL(md_integrity_add_rdev);
static int bind_rdev_to_array(struct md_rdev * rdev, mddev_t * mddev) static int bind_rdev_to_array(struct md_rdev * rdev, struct mddev * mddev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
struct kobject *ko; struct kobject *ko;
...@@ -2170,7 +2170,7 @@ static void kick_rdev_from_array(struct md_rdev * rdev) ...@@ -2170,7 +2170,7 @@ static void kick_rdev_from_array(struct md_rdev * rdev)
export_rdev(rdev); export_rdev(rdev);
} }
static void export_array(mddev_t *mddev) static void export_array(struct mddev *mddev)
{ {
struct md_rdev *rdev, *tmp; struct md_rdev *rdev, *tmp;
...@@ -2293,7 +2293,7 @@ static void md_print_devices(void) ...@@ -2293,7 +2293,7 @@ static void md_print_devices(void)
{ {
struct list_head *tmp; struct list_head *tmp;
struct md_rdev *rdev; struct md_rdev *rdev;
mddev_t *mddev; struct mddev *mddev;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
printk("\n"); printk("\n");
...@@ -2318,7 +2318,7 @@ static void md_print_devices(void) ...@@ -2318,7 +2318,7 @@ static void md_print_devices(void)
} }
static void sync_sbs(mddev_t * mddev, int nospares) static void sync_sbs(struct mddev * mddev, int nospares)
{ {
/* Update each superblock (in-memory image), but /* Update each superblock (in-memory image), but
* if we are allowed to, skip spares which already * if we are allowed to, skip spares which already
...@@ -2341,7 +2341,7 @@ static void sync_sbs(mddev_t * mddev, int nospares) ...@@ -2341,7 +2341,7 @@ static void sync_sbs(mddev_t * mddev, int nospares)
} }
} }
static void md_update_sb(mddev_t * mddev, int force_change) static void md_update_sb(struct mddev * mddev, int force_change)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
int sync_req; int sync_req;
...@@ -2586,7 +2586,7 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) ...@@ -2586,7 +2586,7 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
if (rdev->raid_disk >= 0) if (rdev->raid_disk >= 0)
err = -EBUSY; err = -EBUSY;
else { else {
mddev_t *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
kick_rdev_from_array(rdev); kick_rdev_from_array(rdev);
if (mddev->pers) if (mddev->pers)
md_update_sb(mddev, 1); md_update_sb(mddev, 1);
...@@ -2814,7 +2814,7 @@ static int strict_blocks_to_sectors(const char *buf, sector_t *sectors) ...@@ -2814,7 +2814,7 @@ static int strict_blocks_to_sectors(const char *buf, sector_t *sectors)
static ssize_t static ssize_t
rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len) rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len)
{ {
mddev_t *my_mddev = rdev->mddev; struct mddev *my_mddev = rdev->mddev;
sector_t oldsectors = rdev->sectors; sector_t oldsectors = rdev->sectors;
sector_t sectors; sector_t sectors;
...@@ -2840,7 +2840,7 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len) ...@@ -2840,7 +2840,7 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len)
* a deadlock. We have already changed rdev->sectors, and if * a deadlock. We have already changed rdev->sectors, and if
* we have to change it back, we will have the lock again. * we have to change it back, we will have the lock again.
*/ */
mddev_t *mddev; struct mddev *mddev;
int overlap = 0; int overlap = 0;
struct list_head *tmp; struct list_head *tmp;
...@@ -2967,7 +2967,7 @@ rdev_attr_show(struct kobject *kobj, struct attribute *attr, char *page) ...@@ -2967,7 +2967,7 @@ rdev_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
{ {
struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr); struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr);
struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj); struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj);
mddev_t *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
ssize_t rv; ssize_t rv;
if (!entry->show) if (!entry->show)
...@@ -2991,7 +2991,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, ...@@ -2991,7 +2991,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,
struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr); struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr);
struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj); struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj);
ssize_t rv; ssize_t rv;
mddev_t *mddev = rdev->mddev; struct mddev *mddev = rdev->mddev;
if (!entry->store) if (!entry->store)
return -EIO; return -EIO;
...@@ -3139,7 +3139,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe ...@@ -3139,7 +3139,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
*/ */
static void analyze_sbs(mddev_t * mddev) static void analyze_sbs(struct mddev * mddev)
{ {
int i; int i;
struct md_rdev *rdev, *freshest, *tmp; struct md_rdev *rdev, *freshest, *tmp;
...@@ -3242,13 +3242,13 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale) ...@@ -3242,13 +3242,13 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale)
static void md_safemode_timeout(unsigned long data); static void md_safemode_timeout(unsigned long data);
static ssize_t static ssize_t
safe_delay_show(mddev_t *mddev, char *page) safe_delay_show(struct mddev *mddev, char *page)
{ {
int msec = (mddev->safemode_delay*1000)/HZ; int msec = (mddev->safemode_delay*1000)/HZ;
return sprintf(page, "%d.%03d\n", msec/1000, msec%1000); return sprintf(page, "%d.%03d\n", msec/1000, msec%1000);
} }
static ssize_t static ssize_t
safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len) safe_delay_store(struct mddev *mddev, const char *cbuf, size_t len)
{ {
unsigned long msec; unsigned long msec;
...@@ -3270,7 +3270,7 @@ static struct md_sysfs_entry md_safe_delay = ...@@ -3270,7 +3270,7 @@ static struct md_sysfs_entry md_safe_delay =
__ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store); __ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store);
static ssize_t static ssize_t
level_show(mddev_t *mddev, char *page) level_show(struct mddev *mddev, char *page)
{ {
struct mdk_personality *p = mddev->pers; struct mdk_personality *p = mddev->pers;
if (p) if (p)
...@@ -3284,7 +3284,7 @@ level_show(mddev_t *mddev, char *page) ...@@ -3284,7 +3284,7 @@ level_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
level_store(mddev_t *mddev, const char *buf, size_t len) level_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char clevel[16]; char clevel[16];
ssize_t rv = len; ssize_t rv = len;
...@@ -3465,7 +3465,7 @@ __ATTR(level, S_IRUGO|S_IWUSR, level_show, level_store); ...@@ -3465,7 +3465,7 @@ __ATTR(level, S_IRUGO|S_IWUSR, level_show, level_store);
static ssize_t static ssize_t
layout_show(mddev_t *mddev, char *page) layout_show(struct mddev *mddev, char *page)
{ {
/* just a number, not meaningful for all levels */ /* just a number, not meaningful for all levels */
if (mddev->reshape_position != MaxSector && if (mddev->reshape_position != MaxSector &&
...@@ -3476,7 +3476,7 @@ layout_show(mddev_t *mddev, char *page) ...@@ -3476,7 +3476,7 @@ layout_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
layout_store(mddev_t *mddev, const char *buf, size_t len) layout_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long n = simple_strtoul(buf, &e, 10); unsigned long n = simple_strtoul(buf, &e, 10);
...@@ -3506,7 +3506,7 @@ __ATTR(layout, S_IRUGO|S_IWUSR, layout_show, layout_store); ...@@ -3506,7 +3506,7 @@ __ATTR(layout, S_IRUGO|S_IWUSR, layout_show, layout_store);
static ssize_t static ssize_t
raid_disks_show(mddev_t *mddev, char *page) raid_disks_show(struct mddev *mddev, char *page)
{ {
if (mddev->raid_disks == 0) if (mddev->raid_disks == 0)
return 0; return 0;
...@@ -3517,10 +3517,10 @@ raid_disks_show(mddev_t *mddev, char *page) ...@@ -3517,10 +3517,10 @@ raid_disks_show(mddev_t *mddev, char *page)
return sprintf(page, "%d\n", mddev->raid_disks); return sprintf(page, "%d\n", mddev->raid_disks);
} }
static int update_raid_disks(mddev_t *mddev, int raid_disks); static int update_raid_disks(struct mddev *mddev, int raid_disks);
static ssize_t static ssize_t
raid_disks_store(mddev_t *mddev, const char *buf, size_t len) raid_disks_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
int rv = 0; int rv = 0;
...@@ -3543,7 +3543,7 @@ static struct md_sysfs_entry md_raid_disks = ...@@ -3543,7 +3543,7 @@ static struct md_sysfs_entry md_raid_disks =
__ATTR(raid_disks, S_IRUGO|S_IWUSR, raid_disks_show, raid_disks_store); __ATTR(raid_disks, S_IRUGO|S_IWUSR, raid_disks_show, raid_disks_store);
static ssize_t static ssize_t
chunk_size_show(mddev_t *mddev, char *page) chunk_size_show(struct mddev *mddev, char *page)
{ {
if (mddev->reshape_position != MaxSector && if (mddev->reshape_position != MaxSector &&
mddev->chunk_sectors != mddev->new_chunk_sectors) mddev->chunk_sectors != mddev->new_chunk_sectors)
...@@ -3554,7 +3554,7 @@ chunk_size_show(mddev_t *mddev, char *page) ...@@ -3554,7 +3554,7 @@ chunk_size_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
chunk_size_store(mddev_t *mddev, const char *buf, size_t len) chunk_size_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long n = simple_strtoul(buf, &e, 10); unsigned long n = simple_strtoul(buf, &e, 10);
...@@ -3583,7 +3583,7 @@ static struct md_sysfs_entry md_chunk_size = ...@@ -3583,7 +3583,7 @@ static struct md_sysfs_entry md_chunk_size =
__ATTR(chunk_size, S_IRUGO|S_IWUSR, chunk_size_show, chunk_size_store); __ATTR(chunk_size, S_IRUGO|S_IWUSR, chunk_size_show, chunk_size_store);
static ssize_t static ssize_t
resync_start_show(mddev_t *mddev, char *page) resync_start_show(struct mddev *mddev, char *page)
{ {
if (mddev->recovery_cp == MaxSector) if (mddev->recovery_cp == MaxSector)
return sprintf(page, "none\n"); return sprintf(page, "none\n");
...@@ -3591,7 +3591,7 @@ resync_start_show(mddev_t *mddev, char *page) ...@@ -3591,7 +3591,7 @@ resync_start_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
resync_start_store(mddev_t *mddev, const char *buf, size_t len) resync_start_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long long n = simple_strtoull(buf, &e, 10); unsigned long long n = simple_strtoull(buf, &e, 10);
...@@ -3661,7 +3661,7 @@ static int match_word(const char *word, char **list) ...@@ -3661,7 +3661,7 @@ static int match_word(const char *word, char **list)
} }
static ssize_t static ssize_t
array_state_show(mddev_t *mddev, char *page) array_state_show(struct mddev *mddev, char *page)
{ {
enum array_state st = inactive; enum array_state st = inactive;
...@@ -3694,13 +3694,13 @@ array_state_show(mddev_t *mddev, char *page) ...@@ -3694,13 +3694,13 @@ array_state_show(mddev_t *mddev, char *page)
return sprintf(page, "%s\n", array_states[st]); return sprintf(page, "%s\n", array_states[st]);
} }
static int do_md_stop(mddev_t * mddev, int ro, int is_open); static int do_md_stop(struct mddev * mddev, int ro, int is_open);
static int md_set_readonly(mddev_t * mddev, int is_open); static int md_set_readonly(struct mddev * mddev, int is_open);
static int do_md_run(mddev_t * mddev); static int do_md_run(struct mddev * mddev);
static int restart_array(mddev_t *mddev); static int restart_array(struct mddev *mddev);
static ssize_t static ssize_t
array_state_store(mddev_t *mddev, const char *buf, size_t len) array_state_store(struct mddev *mddev, const char *buf, size_t len)
{ {
int err = -EINVAL; int err = -EINVAL;
enum array_state st = match_word(buf, array_states); enum array_state st = match_word(buf, array_states);
...@@ -3794,13 +3794,13 @@ static struct md_sysfs_entry md_array_state = ...@@ -3794,13 +3794,13 @@ static struct md_sysfs_entry md_array_state =
__ATTR(array_state, S_IRUGO|S_IWUSR, array_state_show, array_state_store); __ATTR(array_state, S_IRUGO|S_IWUSR, array_state_show, array_state_store);
static ssize_t static ssize_t
max_corrected_read_errors_show(mddev_t *mddev, char *page) { max_corrected_read_errors_show(struct mddev *mddev, char *page) {
return sprintf(page, "%d\n", return sprintf(page, "%d\n",
atomic_read(&mddev->max_corr_read_errors)); atomic_read(&mddev->max_corr_read_errors));
} }
static ssize_t static ssize_t
max_corrected_read_errors_store(mddev_t *mddev, const char *buf, size_t len) max_corrected_read_errors_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long n = simple_strtoul(buf, &e, 10); unsigned long n = simple_strtoul(buf, &e, 10);
...@@ -3817,13 +3817,13 @@ __ATTR(max_read_errors, S_IRUGO|S_IWUSR, max_corrected_read_errors_show, ...@@ -3817,13 +3817,13 @@ __ATTR(max_read_errors, S_IRUGO|S_IWUSR, max_corrected_read_errors_show,
max_corrected_read_errors_store); max_corrected_read_errors_store);
static ssize_t static ssize_t
null_show(mddev_t *mddev, char *page) null_show(struct mddev *mddev, char *page)
{ {
return -EINVAL; return -EINVAL;
} }
static ssize_t static ssize_t
new_dev_store(mddev_t *mddev, const char *buf, size_t len) new_dev_store(struct mddev *mddev, const char *buf, size_t len)
{ {
/* buf must be %d:%d\n? giving major and minor numbers */ /* buf must be %d:%d\n? giving major and minor numbers */
/* The new device is added to the array. /* The new device is added to the array.
...@@ -3880,7 +3880,7 @@ static struct md_sysfs_entry md_new_device = ...@@ -3880,7 +3880,7 @@ static struct md_sysfs_entry md_new_device =
__ATTR(new_dev, S_IWUSR, null_show, new_dev_store); __ATTR(new_dev, S_IWUSR, null_show, new_dev_store);
static ssize_t static ssize_t
bitmap_store(mddev_t *mddev, const char *buf, size_t len) bitmap_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *end; char *end;
unsigned long chunk, end_chunk; unsigned long chunk, end_chunk;
...@@ -3909,16 +3909,16 @@ static struct md_sysfs_entry md_bitmap = ...@@ -3909,16 +3909,16 @@ static struct md_sysfs_entry md_bitmap =
__ATTR(bitmap_set_bits, S_IWUSR, null_show, bitmap_store); __ATTR(bitmap_set_bits, S_IWUSR, null_show, bitmap_store);
static ssize_t static ssize_t
size_show(mddev_t *mddev, char *page) size_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%llu\n", return sprintf(page, "%llu\n",
(unsigned long long)mddev->dev_sectors / 2); (unsigned long long)mddev->dev_sectors / 2);
} }
static int update_size(mddev_t *mddev, sector_t num_sectors); static int update_size(struct mddev *mddev, sector_t num_sectors);
static ssize_t static ssize_t
size_store(mddev_t *mddev, const char *buf, size_t len) size_store(struct mddev *mddev, const char *buf, size_t len)
{ {
/* If array is inactive, we can reduce the component size, but /* If array is inactive, we can reduce the component size, but
* not increase it (except from 0). * not increase it (except from 0).
...@@ -3953,7 +3953,7 @@ __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); ...@@ -3953,7 +3953,7 @@ __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);
* or N.M for internally known formats * or N.M for internally known formats
*/ */
static ssize_t static ssize_t
metadata_show(mddev_t *mddev, char *page) metadata_show(struct mddev *mddev, char *page)
{ {
if (mddev->persistent) if (mddev->persistent)
return sprintf(page, "%d.%d\n", return sprintf(page, "%d.%d\n",
...@@ -3965,7 +3965,7 @@ metadata_show(mddev_t *mddev, char *page) ...@@ -3965,7 +3965,7 @@ metadata_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
metadata_store(mddev_t *mddev, const char *buf, size_t len) metadata_store(struct mddev *mddev, const char *buf, size_t len)
{ {
int major, minor; int major, minor;
char *e; char *e;
...@@ -4019,7 +4019,7 @@ static struct md_sysfs_entry md_metadata = ...@@ -4019,7 +4019,7 @@ static struct md_sysfs_entry md_metadata =
__ATTR(metadata_version, S_IRUGO|S_IWUSR, metadata_show, metadata_store); __ATTR(metadata_version, S_IRUGO|S_IWUSR, metadata_show, metadata_store);
static ssize_t static ssize_t
action_show(mddev_t *mddev, char *page) action_show(struct mddev *mddev, char *page)
{ {
char *type = "idle"; char *type = "idle";
if (test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) if (test_bit(MD_RECOVERY_FROZEN, &mddev->recovery))
...@@ -4041,10 +4041,10 @@ action_show(mddev_t *mddev, char *page) ...@@ -4041,10 +4041,10 @@ action_show(mddev_t *mddev, char *page)
return sprintf(page, "%s\n", type); return sprintf(page, "%s\n", type);
} }
static void reap_sync_thread(mddev_t *mddev); static void reap_sync_thread(struct mddev *mddev);
static ssize_t static ssize_t
action_store(mddev_t *mddev, const char *page, size_t len) action_store(struct mddev *mddev, const char *page, size_t len)
{ {
if (!mddev->pers || !mddev->pers->sync_request) if (!mddev->pers || !mddev->pers->sync_request)
return -EINVAL; return -EINVAL;
...@@ -4090,7 +4090,7 @@ action_store(mddev_t *mddev, const char *page, size_t len) ...@@ -4090,7 +4090,7 @@ action_store(mddev_t *mddev, const char *page, size_t len)
} }
static ssize_t static ssize_t
mismatch_cnt_show(mddev_t *mddev, char *page) mismatch_cnt_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%llu\n", return sprintf(page, "%llu\n",
(unsigned long long) mddev->resync_mismatches); (unsigned long long) mddev->resync_mismatches);
...@@ -4103,14 +4103,14 @@ __ATTR(sync_action, S_IRUGO|S_IWUSR, action_show, action_store); ...@@ -4103,14 +4103,14 @@ __ATTR(sync_action, S_IRUGO|S_IWUSR, action_show, action_store);
static struct md_sysfs_entry md_mismatches = __ATTR_RO(mismatch_cnt); static struct md_sysfs_entry md_mismatches = __ATTR_RO(mismatch_cnt);
static ssize_t static ssize_t
sync_min_show(mddev_t *mddev, char *page) sync_min_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%d (%s)\n", speed_min(mddev), return sprintf(page, "%d (%s)\n", speed_min(mddev),
mddev->sync_speed_min ? "local": "system"); mddev->sync_speed_min ? "local": "system");
} }
static ssize_t static ssize_t
sync_min_store(mddev_t *mddev, const char *buf, size_t len) sync_min_store(struct mddev *mddev, const char *buf, size_t len)
{ {
int min; int min;
char *e; char *e;
...@@ -4129,14 +4129,14 @@ static struct md_sysfs_entry md_sync_min = ...@@ -4129,14 +4129,14 @@ static struct md_sysfs_entry md_sync_min =
__ATTR(sync_speed_min, S_IRUGO|S_IWUSR, sync_min_show, sync_min_store); __ATTR(sync_speed_min, S_IRUGO|S_IWUSR, sync_min_show, sync_min_store);
static ssize_t static ssize_t
sync_max_show(mddev_t *mddev, char *page) sync_max_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%d (%s)\n", speed_max(mddev), return sprintf(page, "%d (%s)\n", speed_max(mddev),
mddev->sync_speed_max ? "local": "system"); mddev->sync_speed_max ? "local": "system");
} }
static ssize_t static ssize_t
sync_max_store(mddev_t *mddev, const char *buf, size_t len) sync_max_store(struct mddev *mddev, const char *buf, size_t len)
{ {
int max; int max;
char *e; char *e;
...@@ -4155,20 +4155,20 @@ static struct md_sysfs_entry md_sync_max = ...@@ -4155,20 +4155,20 @@ static struct md_sysfs_entry md_sync_max =
__ATTR(sync_speed_max, S_IRUGO|S_IWUSR, sync_max_show, sync_max_store); __ATTR(sync_speed_max, S_IRUGO|S_IWUSR, sync_max_show, sync_max_store);
static ssize_t static ssize_t
degraded_show(mddev_t *mddev, char *page) degraded_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%d\n", mddev->degraded); return sprintf(page, "%d\n", mddev->degraded);
} }
static struct md_sysfs_entry md_degraded = __ATTR_RO(degraded); static struct md_sysfs_entry md_degraded = __ATTR_RO(degraded);
static ssize_t static ssize_t
sync_force_parallel_show(mddev_t *mddev, char *page) sync_force_parallel_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%d\n", mddev->parallel_resync); return sprintf(page, "%d\n", mddev->parallel_resync);
} }
static ssize_t static ssize_t
sync_force_parallel_store(mddev_t *mddev, const char *buf, size_t len) sync_force_parallel_store(struct mddev *mddev, const char *buf, size_t len)
{ {
long n; long n;
...@@ -4192,7 +4192,7 @@ __ATTR(sync_force_parallel, S_IRUGO|S_IWUSR, ...@@ -4192,7 +4192,7 @@ __ATTR(sync_force_parallel, S_IRUGO|S_IWUSR,
sync_force_parallel_show, sync_force_parallel_store); sync_force_parallel_show, sync_force_parallel_store);
static ssize_t static ssize_t
sync_speed_show(mddev_t *mddev, char *page) sync_speed_show(struct mddev *mddev, char *page)
{ {
unsigned long resync, dt, db; unsigned long resync, dt, db;
if (mddev->curr_resync == 0) if (mddev->curr_resync == 0)
...@@ -4207,7 +4207,7 @@ sync_speed_show(mddev_t *mddev, char *page) ...@@ -4207,7 +4207,7 @@ sync_speed_show(mddev_t *mddev, char *page)
static struct md_sysfs_entry md_sync_speed = __ATTR_RO(sync_speed); static struct md_sysfs_entry md_sync_speed = __ATTR_RO(sync_speed);
static ssize_t static ssize_t
sync_completed_show(mddev_t *mddev, char *page) sync_completed_show(struct mddev *mddev, char *page)
{ {
unsigned long long max_sectors, resync; unsigned long long max_sectors, resync;
...@@ -4226,13 +4226,13 @@ sync_completed_show(mddev_t *mddev, char *page) ...@@ -4226,13 +4226,13 @@ sync_completed_show(mddev_t *mddev, char *page)
static struct md_sysfs_entry md_sync_completed = __ATTR_RO(sync_completed); static struct md_sysfs_entry md_sync_completed = __ATTR_RO(sync_completed);
static ssize_t static ssize_t
min_sync_show(mddev_t *mddev, char *page) min_sync_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%llu\n", return sprintf(page, "%llu\n",
(unsigned long long)mddev->resync_min); (unsigned long long)mddev->resync_min);
} }
static ssize_t static ssize_t
min_sync_store(mddev_t *mddev, const char *buf, size_t len) min_sync_store(struct mddev *mddev, const char *buf, size_t len)
{ {
unsigned long long min; unsigned long long min;
if (strict_strtoull(buf, 10, &min)) if (strict_strtoull(buf, 10, &min))
...@@ -4257,7 +4257,7 @@ static struct md_sysfs_entry md_min_sync = ...@@ -4257,7 +4257,7 @@ static struct md_sysfs_entry md_min_sync =
__ATTR(sync_min, S_IRUGO|S_IWUSR, min_sync_show, min_sync_store); __ATTR(sync_min, S_IRUGO|S_IWUSR, min_sync_show, min_sync_store);
static ssize_t static ssize_t
max_sync_show(mddev_t *mddev, char *page) max_sync_show(struct mddev *mddev, char *page)
{ {
if (mddev->resync_max == MaxSector) if (mddev->resync_max == MaxSector)
return sprintf(page, "max\n"); return sprintf(page, "max\n");
...@@ -4266,7 +4266,7 @@ max_sync_show(mddev_t *mddev, char *page) ...@@ -4266,7 +4266,7 @@ max_sync_show(mddev_t *mddev, char *page)
(unsigned long long)mddev->resync_max); (unsigned long long)mddev->resync_max);
} }
static ssize_t static ssize_t
max_sync_store(mddev_t *mddev, const char *buf, size_t len) max_sync_store(struct mddev *mddev, const char *buf, size_t len)
{ {
if (strncmp(buf, "max", 3) == 0) if (strncmp(buf, "max", 3) == 0)
mddev->resync_max = MaxSector; mddev->resync_max = MaxSector;
...@@ -4297,13 +4297,13 @@ static struct md_sysfs_entry md_max_sync = ...@@ -4297,13 +4297,13 @@ static struct md_sysfs_entry md_max_sync =
__ATTR(sync_max, S_IRUGO|S_IWUSR, max_sync_show, max_sync_store); __ATTR(sync_max, S_IRUGO|S_IWUSR, max_sync_show, max_sync_store);
static ssize_t static ssize_t
suspend_lo_show(mddev_t *mddev, char *page) suspend_lo_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_lo); return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_lo);
} }
static ssize_t static ssize_t
suspend_lo_store(mddev_t *mddev, const char *buf, size_t len) suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long long new = simple_strtoull(buf, &e, 10); unsigned long long new = simple_strtoull(buf, &e, 10);
...@@ -4331,13 +4331,13 @@ __ATTR(suspend_lo, S_IRUGO|S_IWUSR, suspend_lo_show, suspend_lo_store); ...@@ -4331,13 +4331,13 @@ __ATTR(suspend_lo, S_IRUGO|S_IWUSR, suspend_lo_show, suspend_lo_store);
static ssize_t static ssize_t
suspend_hi_show(mddev_t *mddev, char *page) suspend_hi_show(struct mddev *mddev, char *page)
{ {
return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_hi); return sprintf(page, "%llu\n", (unsigned long long)mddev->suspend_hi);
} }
static ssize_t static ssize_t
suspend_hi_store(mddev_t *mddev, const char *buf, size_t len) suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long long new = simple_strtoull(buf, &e, 10); unsigned long long new = simple_strtoull(buf, &e, 10);
...@@ -4364,7 +4364,7 @@ static struct md_sysfs_entry md_suspend_hi = ...@@ -4364,7 +4364,7 @@ static struct md_sysfs_entry md_suspend_hi =
__ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store); __ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store);
static ssize_t static ssize_t
reshape_position_show(mddev_t *mddev, char *page) reshape_position_show(struct mddev *mddev, char *page)
{ {
if (mddev->reshape_position != MaxSector) if (mddev->reshape_position != MaxSector)
return sprintf(page, "%llu\n", return sprintf(page, "%llu\n",
...@@ -4374,7 +4374,7 @@ reshape_position_show(mddev_t *mddev, char *page) ...@@ -4374,7 +4374,7 @@ reshape_position_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
reshape_position_store(mddev_t *mddev, const char *buf, size_t len) reshape_position_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char *e; char *e;
unsigned long long new = simple_strtoull(buf, &e, 10); unsigned long long new = simple_strtoull(buf, &e, 10);
...@@ -4395,7 +4395,7 @@ __ATTR(reshape_position, S_IRUGO|S_IWUSR, reshape_position_show, ...@@ -4395,7 +4395,7 @@ __ATTR(reshape_position, S_IRUGO|S_IWUSR, reshape_position_show,
reshape_position_store); reshape_position_store);
static ssize_t static ssize_t
array_size_show(mddev_t *mddev, char *page) array_size_show(struct mddev *mddev, char *page)
{ {
if (mddev->external_size) if (mddev->external_size)
return sprintf(page, "%llu\n", return sprintf(page, "%llu\n",
...@@ -4405,7 +4405,7 @@ array_size_show(mddev_t *mddev, char *page) ...@@ -4405,7 +4405,7 @@ array_size_show(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
array_size_store(mddev_t *mddev, const char *buf, size_t len) array_size_store(struct mddev *mddev, const char *buf, size_t len)
{ {
sector_t sectors; sector_t sectors;
...@@ -4480,7 +4480,7 @@ static ssize_t ...@@ -4480,7 +4480,7 @@ static ssize_t
md_attr_show(struct kobject *kobj, struct attribute *attr, char *page) md_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
{ {
struct md_sysfs_entry *entry = container_of(attr, struct md_sysfs_entry, attr); struct md_sysfs_entry *entry = container_of(attr, struct md_sysfs_entry, attr);
mddev_t *mddev = container_of(kobj, struct mddev_s, kobj); struct mddev *mddev = container_of(kobj, struct mddev, kobj);
ssize_t rv; ssize_t rv;
if (!entry->show) if (!entry->show)
...@@ -4498,7 +4498,7 @@ md_attr_store(struct kobject *kobj, struct attribute *attr, ...@@ -4498,7 +4498,7 @@ md_attr_store(struct kobject *kobj, struct attribute *attr,
const char *page, size_t length) const char *page, size_t length)
{ {
struct md_sysfs_entry *entry = container_of(attr, struct md_sysfs_entry, attr); struct md_sysfs_entry *entry = container_of(attr, struct md_sysfs_entry, attr);
mddev_t *mddev = container_of(kobj, struct mddev_s, kobj); struct mddev *mddev = container_of(kobj, struct mddev, kobj);
ssize_t rv; ssize_t rv;
if (!entry->store) if (!entry->store)
...@@ -4517,7 +4517,7 @@ md_attr_store(struct kobject *kobj, struct attribute *attr, ...@@ -4517,7 +4517,7 @@ md_attr_store(struct kobject *kobj, struct attribute *attr,
static void md_free(struct kobject *ko) static void md_free(struct kobject *ko)
{ {
mddev_t *mddev = container_of(ko, mddev_t, kobj); struct mddev *mddev = container_of(ko, struct mddev, kobj);
if (mddev->sysfs_state) if (mddev->sysfs_state)
sysfs_put(mddev->sysfs_state); sysfs_put(mddev->sysfs_state);
...@@ -4546,7 +4546,7 @@ int mdp_major = 0; ...@@ -4546,7 +4546,7 @@ int mdp_major = 0;
static void mddev_delayed_delete(struct work_struct *ws) static void mddev_delayed_delete(struct work_struct *ws)
{ {
mddev_t *mddev = container_of(ws, mddev_t, del_work); struct mddev *mddev = container_of(ws, struct mddev, del_work);
sysfs_remove_group(&mddev->kobj, &md_bitmap_group); sysfs_remove_group(&mddev->kobj, &md_bitmap_group);
kobject_del(&mddev->kobj); kobject_del(&mddev->kobj);
...@@ -4556,7 +4556,7 @@ static void mddev_delayed_delete(struct work_struct *ws) ...@@ -4556,7 +4556,7 @@ static void mddev_delayed_delete(struct work_struct *ws)
static int md_alloc(dev_t dev, char *name) static int md_alloc(dev_t dev, char *name)
{ {
static DEFINE_MUTEX(disks_mutex); static DEFINE_MUTEX(disks_mutex);
mddev_t *mddev = mddev_find(dev); struct mddev *mddev = mddev_find(dev);
struct gendisk *disk; struct gendisk *disk;
int partitioned; int partitioned;
int shift; int shift;
...@@ -4583,7 +4583,7 @@ static int md_alloc(dev_t dev, char *name) ...@@ -4583,7 +4583,7 @@ static int md_alloc(dev_t dev, char *name)
if (name) { if (name) {
/* Need to ensure that 'name' is not a duplicate. /* Need to ensure that 'name' is not a duplicate.
*/ */
mddev_t *mddev2; struct mddev *mddev2;
spin_lock(&all_mddevs_lock); spin_lock(&all_mddevs_lock);
list_for_each_entry(mddev2, &all_mddevs, all_mddevs) list_for_each_entry(mddev2, &all_mddevs, all_mddevs)
...@@ -4684,7 +4684,7 @@ static int add_named_array(const char *val, struct kernel_param *kp) ...@@ -4684,7 +4684,7 @@ static int add_named_array(const char *val, struct kernel_param *kp)
static void md_safemode_timeout(unsigned long data) static void md_safemode_timeout(unsigned long data)
{ {
mddev_t *mddev = (mddev_t *) data; struct mddev *mddev = (struct mddev *) data;
if (!atomic_read(&mddev->writes_pending)) { if (!atomic_read(&mddev->writes_pending)) {
mddev->safemode = 1; mddev->safemode = 1;
...@@ -4696,7 +4696,7 @@ static void md_safemode_timeout(unsigned long data) ...@@ -4696,7 +4696,7 @@ static void md_safemode_timeout(unsigned long data)
static int start_dirty_degraded; static int start_dirty_degraded;
int md_run(mddev_t *mddev) int md_run(struct mddev *mddev)
{ {
int err; int err;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -4764,7 +4764,7 @@ int md_run(mddev_t *mddev) ...@@ -4764,7 +4764,7 @@ int md_run(mddev_t *mddev)
if (mddev->bio_set == NULL) if (mddev->bio_set == NULL)
mddev->bio_set = bioset_create(BIO_POOL_SIZE, mddev->bio_set = bioset_create(BIO_POOL_SIZE,
sizeof(mddev_t *)); sizeof(struct mddev *));
spin_lock(&pers_lock); spin_lock(&pers_lock);
pers = find_pers(mddev->level, mddev->clevel); pers = find_pers(mddev->level, mddev->clevel);
...@@ -4898,7 +4898,7 @@ int md_run(mddev_t *mddev) ...@@ -4898,7 +4898,7 @@ int md_run(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(md_run); EXPORT_SYMBOL_GPL(md_run);
static int do_md_run(mddev_t *mddev) static int do_md_run(struct mddev *mddev)
{ {
int err; int err;
...@@ -4922,7 +4922,7 @@ static int do_md_run(mddev_t *mddev) ...@@ -4922,7 +4922,7 @@ static int do_md_run(mddev_t *mddev)
return err; return err;
} }
static int restart_array(mddev_t *mddev) static int restart_array(struct mddev *mddev)
{ {
struct gendisk *disk = mddev->gendisk; struct gendisk *disk = mddev->gendisk;
...@@ -4972,7 +4972,7 @@ void restore_bitmap_write_access(struct file *file) ...@@ -4972,7 +4972,7 @@ void restore_bitmap_write_access(struct file *file)
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
} }
static void md_clean(mddev_t *mddev) static void md_clean(struct mddev *mddev)
{ {
mddev->array_sectors = 0; mddev->array_sectors = 0;
mddev->external_size = 0; mddev->external_size = 0;
...@@ -5015,7 +5015,7 @@ static void md_clean(mddev_t *mddev) ...@@ -5015,7 +5015,7 @@ static void md_clean(mddev_t *mddev)
mddev->bitmap_info.max_write_behind = 0; mddev->bitmap_info.max_write_behind = 0;
} }
static void __md_stop_writes(mddev_t *mddev) static void __md_stop_writes(struct mddev *mddev)
{ {
if (mddev->sync_thread) { if (mddev->sync_thread) {
set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
...@@ -5035,7 +5035,7 @@ static void __md_stop_writes(mddev_t *mddev) ...@@ -5035,7 +5035,7 @@ static void __md_stop_writes(mddev_t *mddev)
} }
} }
void md_stop_writes(mddev_t *mddev) void md_stop_writes(struct mddev *mddev)
{ {
mddev_lock(mddev); mddev_lock(mddev);
__md_stop_writes(mddev); __md_stop_writes(mddev);
...@@ -5043,7 +5043,7 @@ void md_stop_writes(mddev_t *mddev) ...@@ -5043,7 +5043,7 @@ void md_stop_writes(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(md_stop_writes); EXPORT_SYMBOL_GPL(md_stop_writes);
void md_stop(mddev_t *mddev) void md_stop(struct mddev *mddev)
{ {
mddev->ready = 0; mddev->ready = 0;
mddev->pers->stop(mddev); mddev->pers->stop(mddev);
...@@ -5055,7 +5055,7 @@ void md_stop(mddev_t *mddev) ...@@ -5055,7 +5055,7 @@ void md_stop(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(md_stop); EXPORT_SYMBOL_GPL(md_stop);
static int md_set_readonly(mddev_t *mddev, int is_open) static int md_set_readonly(struct mddev *mddev, int is_open)
{ {
int err = 0; int err = 0;
mutex_lock(&mddev->open_mutex); mutex_lock(&mddev->open_mutex);
...@@ -5085,7 +5085,7 @@ static int md_set_readonly(mddev_t *mddev, int is_open) ...@@ -5085,7 +5085,7 @@ static int md_set_readonly(mddev_t *mddev, int is_open)
* 0 - completely stop and dis-assemble array * 0 - completely stop and dis-assemble array
* 2 - stop but do not disassemble array * 2 - stop but do not disassemble array
*/ */
static int do_md_stop(mddev_t * mddev, int mode, int is_open) static int do_md_stop(struct mddev * mddev, int mode, int is_open)
{ {
struct gendisk *disk = mddev->gendisk; struct gendisk *disk = mddev->gendisk;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -5151,7 +5151,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) ...@@ -5151,7 +5151,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
} }
#ifndef MODULE #ifndef MODULE
static void autorun_array(mddev_t *mddev) static void autorun_array(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
int err; int err;
...@@ -5189,7 +5189,7 @@ static void autorun_array(mddev_t *mddev) ...@@ -5189,7 +5189,7 @@ static void autorun_array(mddev_t *mddev)
static void autorun_devices(int part) static void autorun_devices(int part)
{ {
struct md_rdev *rdev0, *rdev, *tmp; struct md_rdev *rdev0, *rdev, *tmp;
mddev_t *mddev; struct mddev *mddev;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
printk(KERN_INFO "md: autorun ...\n"); printk(KERN_INFO "md: autorun ...\n");
...@@ -5284,7 +5284,7 @@ static int get_version(void __user * arg) ...@@ -5284,7 +5284,7 @@ static int get_version(void __user * arg)
return 0; return 0;
} }
static int get_array_info(mddev_t * mddev, void __user * arg) static int get_array_info(struct mddev * mddev, void __user * arg)
{ {
mdu_array_info_t info; mdu_array_info_t info;
int nr,working,insync,failed,spare; int nr,working,insync,failed,spare;
...@@ -5337,7 +5337,7 @@ static int get_array_info(mddev_t * mddev, void __user * arg) ...@@ -5337,7 +5337,7 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
return 0; return 0;
} }
static int get_bitmap_file(mddev_t * mddev, void __user * arg) static int get_bitmap_file(struct mddev * mddev, void __user * arg)
{ {
mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */ mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */
char *ptr, *buf = NULL; char *ptr, *buf = NULL;
...@@ -5377,7 +5377,7 @@ static int get_bitmap_file(mddev_t * mddev, void __user * arg) ...@@ -5377,7 +5377,7 @@ static int get_bitmap_file(mddev_t * mddev, void __user * arg)
return err; return err;
} }
static int get_disk_info(mddev_t * mddev, void __user * arg) static int get_disk_info(struct mddev * mddev, void __user * arg)
{ {
mdu_disk_info_t info; mdu_disk_info_t info;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -5411,7 +5411,7 @@ static int get_disk_info(mddev_t * mddev, void __user * arg) ...@@ -5411,7 +5411,7 @@ static int get_disk_info(mddev_t * mddev, void __user * arg)
return 0; return 0;
} }
static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) static int add_new_disk(struct mddev * mddev, mdu_disk_info_t *info)
{ {
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -5583,7 +5583,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) ...@@ -5583,7 +5583,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
return 0; return 0;
} }
static int hot_remove_disk(mddev_t * mddev, dev_t dev) static int hot_remove_disk(struct mddev * mddev, dev_t dev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -5606,7 +5606,7 @@ static int hot_remove_disk(mddev_t * mddev, dev_t dev) ...@@ -5606,7 +5606,7 @@ static int hot_remove_disk(mddev_t * mddev, dev_t dev)
return -EBUSY; return -EBUSY;
} }
static int hot_add_disk(mddev_t * mddev, dev_t dev) static int hot_add_disk(struct mddev * mddev, dev_t dev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
int err; int err;
...@@ -5680,7 +5680,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev) ...@@ -5680,7 +5680,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
return err; return err;
} }
static int set_bitmap_file(mddev_t *mddev, int fd) static int set_bitmap_file(struct mddev *mddev, int fd)
{ {
int err; int err;
...@@ -5753,7 +5753,7 @@ static int set_bitmap_file(mddev_t *mddev, int fd) ...@@ -5753,7 +5753,7 @@ static int set_bitmap_file(mddev_t *mddev, int fd)
* The minor and patch _version numbers are also kept incase the * The minor and patch _version numbers are also kept incase the
* super_block handler wishes to interpret them. * super_block handler wishes to interpret them.
*/ */
static int set_array_info(mddev_t * mddev, mdu_array_info_t *info) static int set_array_info(struct mddev * mddev, mdu_array_info_t *info)
{ {
if (info->raid_disks == 0) { if (info->raid_disks == 0) {
...@@ -5823,7 +5823,7 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info) ...@@ -5823,7 +5823,7 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
return 0; return 0;
} }
void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors) void md_set_array_sectors(struct mddev *mddev, sector_t array_sectors)
{ {
WARN(!mddev_is_locked(mddev), "%s: unlocked mddev!\n", __func__); WARN(!mddev_is_locked(mddev), "%s: unlocked mddev!\n", __func__);
...@@ -5834,7 +5834,7 @@ void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors) ...@@ -5834,7 +5834,7 @@ void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors)
} }
EXPORT_SYMBOL(md_set_array_sectors); EXPORT_SYMBOL(md_set_array_sectors);
static int update_size(mddev_t *mddev, sector_t num_sectors) static int update_size(struct mddev *mddev, sector_t num_sectors)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
int rv; int rv;
...@@ -5872,7 +5872,7 @@ static int update_size(mddev_t *mddev, sector_t num_sectors) ...@@ -5872,7 +5872,7 @@ static int update_size(mddev_t *mddev, sector_t num_sectors)
return rv; return rv;
} }
static int update_raid_disks(mddev_t *mddev, int raid_disks) static int update_raid_disks(struct mddev *mddev, int raid_disks)
{ {
int rv; int rv;
/* change the number of raid disks */ /* change the number of raid disks */
...@@ -5900,7 +5900,7 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks) ...@@ -5900,7 +5900,7 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
* Any differences that cannot be handled will cause an error. * Any differences that cannot be handled will cause an error.
* Normally, only one change can be managed at a time. * Normally, only one change can be managed at a time.
*/ */
static int update_array_info(mddev_t *mddev, mdu_array_info_t *info) static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
{ {
int rv = 0; int rv = 0;
int cnt = 0; int cnt = 0;
...@@ -5993,7 +5993,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info) ...@@ -5993,7 +5993,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
return rv; return rv;
} }
static int set_disk_faulty(mddev_t *mddev, dev_t dev) static int set_disk_faulty(struct mddev *mddev, dev_t dev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -6018,7 +6018,7 @@ static int set_disk_faulty(mddev_t *mddev, dev_t dev) ...@@ -6018,7 +6018,7 @@ static int set_disk_faulty(mddev_t *mddev, dev_t dev)
*/ */
static int md_getgeo(struct block_device *bdev, struct hd_geometry *geo) static int md_getgeo(struct block_device *bdev, struct hd_geometry *geo)
{ {
mddev_t *mddev = bdev->bd_disk->private_data; struct mddev *mddev = bdev->bd_disk->private_data;
geo->heads = 2; geo->heads = 2;
geo->sectors = 4; geo->sectors = 4;
...@@ -6031,7 +6031,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -6031,7 +6031,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
{ {
int err = 0; int err = 0;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
mddev_t *mddev = NULL; struct mddev *mddev = NULL;
int ro; int ro;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
...@@ -6294,7 +6294,7 @@ static int md_open(struct block_device *bdev, fmode_t mode) ...@@ -6294,7 +6294,7 @@ static int md_open(struct block_device *bdev, fmode_t mode)
* Succeed if we can lock the mddev, which confirms that * Succeed if we can lock the mddev, which confirms that
* it isn't being stopped right now. * it isn't being stopped right now.
*/ */
mddev_t *mddev = mddev_find(bdev->bd_dev); struct mddev *mddev = mddev_find(bdev->bd_dev);
int err; int err;
if (mddev->gendisk != bdev->bd_disk) { if (mddev->gendisk != bdev->bd_disk) {
...@@ -6323,7 +6323,7 @@ static int md_open(struct block_device *bdev, fmode_t mode) ...@@ -6323,7 +6323,7 @@ static int md_open(struct block_device *bdev, fmode_t mode)
static int md_release(struct gendisk *disk, fmode_t mode) static int md_release(struct gendisk *disk, fmode_t mode)
{ {
mddev_t *mddev = disk->private_data; struct mddev *mddev = disk->private_data;
BUG_ON(!mddev); BUG_ON(!mddev);
atomic_dec(&mddev->openers); atomic_dec(&mddev->openers);
...@@ -6334,14 +6334,14 @@ static int md_release(struct gendisk *disk, fmode_t mode) ...@@ -6334,14 +6334,14 @@ static int md_release(struct gendisk *disk, fmode_t mode)
static int md_media_changed(struct gendisk *disk) static int md_media_changed(struct gendisk *disk)
{ {
mddev_t *mddev = disk->private_data; struct mddev *mddev = disk->private_data;
return mddev->changed; return mddev->changed;
} }
static int md_revalidate(struct gendisk *disk) static int md_revalidate(struct gendisk *disk)
{ {
mddev_t *mddev = disk->private_data; struct mddev *mddev = disk->private_data;
mddev->changed = 0; mddev->changed = 0;
return 0; return 0;
...@@ -6410,7 +6410,7 @@ void md_wakeup_thread(mdk_thread_t *thread) ...@@ -6410,7 +6410,7 @@ void md_wakeup_thread(mdk_thread_t *thread)
} }
} }
mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev, mdk_thread_t *md_register_thread(void (*run) (struct mddev *), struct mddev *mddev,
const char *name) const char *name)
{ {
mdk_thread_t *thread; mdk_thread_t *thread;
...@@ -6452,7 +6452,7 @@ void md_unregister_thread(mdk_thread_t **threadp) ...@@ -6452,7 +6452,7 @@ void md_unregister_thread(mdk_thread_t **threadp)
kfree(thread); kfree(thread);
} }
void md_error(mddev_t *mddev, struct md_rdev *rdev) void md_error(struct mddev *mddev, struct md_rdev *rdev)
{ {
if (!mddev) { if (!mddev) {
MD_BUG(); MD_BUG();
...@@ -6498,7 +6498,7 @@ static void status_unused(struct seq_file *seq) ...@@ -6498,7 +6498,7 @@ static void status_unused(struct seq_file *seq)
} }
static void status_resync(struct seq_file *seq, mddev_t * mddev) static void status_resync(struct seq_file *seq, struct mddev * mddev)
{ {
sector_t max_sectors, resync, res; sector_t max_sectors, resync, res;
unsigned long dt, db; unsigned long dt, db;
...@@ -6589,7 +6589,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -6589,7 +6589,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos)
{ {
struct list_head *tmp; struct list_head *tmp;
loff_t l = *pos; loff_t l = *pos;
mddev_t *mddev; struct mddev *mddev;
if (l >= 0x10000) if (l >= 0x10000)
return NULL; return NULL;
...@@ -6600,7 +6600,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -6600,7 +6600,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos)
spin_lock(&all_mddevs_lock); spin_lock(&all_mddevs_lock);
list_for_each(tmp,&all_mddevs) list_for_each(tmp,&all_mddevs)
if (!l--) { if (!l--) {
mddev = list_entry(tmp, mddev_t, all_mddevs); mddev = list_entry(tmp, struct mddev, all_mddevs);
mddev_get(mddev); mddev_get(mddev);
spin_unlock(&all_mddevs_lock); spin_unlock(&all_mddevs_lock);
return mddev; return mddev;
...@@ -6614,7 +6614,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -6614,7 +6614,7 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos)
static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct list_head *tmp; struct list_head *tmp;
mddev_t *next_mddev, *mddev = v; struct mddev *next_mddev, *mddev = v;
++*pos; ++*pos;
if (v == (void*)2) if (v == (void*)2)
...@@ -6626,7 +6626,7 @@ static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -6626,7 +6626,7 @@ static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos)
else else
tmp = mddev->all_mddevs.next; tmp = mddev->all_mddevs.next;
if (tmp != &all_mddevs) if (tmp != &all_mddevs)
next_mddev = mddev_get(list_entry(tmp,mddev_t,all_mddevs)); next_mddev = mddev_get(list_entry(tmp,struct mddev,all_mddevs));
else { else {
next_mddev = (void*)2; next_mddev = (void*)2;
*pos = 0x10000; *pos = 0x10000;
...@@ -6641,7 +6641,7 @@ static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -6641,7 +6641,7 @@ static void *md_seq_next(struct seq_file *seq, void *v, loff_t *pos)
static void md_seq_stop(struct seq_file *seq, void *v) static void md_seq_stop(struct seq_file *seq, void *v)
{ {
mddev_t *mddev = v; struct mddev *mddev = v;
if (mddev && v != (void*)1 && v != (void*)2) if (mddev && v != (void*)1 && v != (void*)2)
mddev_put(mddev); mddev_put(mddev);
...@@ -6649,7 +6649,7 @@ static void md_seq_stop(struct seq_file *seq, void *v) ...@@ -6649,7 +6649,7 @@ static void md_seq_stop(struct seq_file *seq, void *v)
static int md_seq_show(struct seq_file *seq, void *v) static int md_seq_show(struct seq_file *seq, void *v)
{ {
mddev_t *mddev = v; struct mddev *mddev = v;
sector_t sectors; sector_t sectors;
struct md_rdev *rdev; struct md_rdev *rdev;
struct bitmap *bitmap; struct bitmap *bitmap;
...@@ -6829,7 +6829,7 @@ int unregister_md_personality(struct mdk_personality *p) ...@@ -6829,7 +6829,7 @@ int unregister_md_personality(struct mdk_personality *p)
return 0; return 0;
} }
static int is_mddev_idle(mddev_t *mddev, int init) static int is_mddev_idle(struct mddev *mddev, int init)
{ {
struct md_rdev * rdev; struct md_rdev * rdev;
int idle; int idle;
...@@ -6873,7 +6873,7 @@ static int is_mddev_idle(mddev_t *mddev, int init) ...@@ -6873,7 +6873,7 @@ static int is_mddev_idle(mddev_t *mddev, int init)
return idle; return idle;
} }
void md_done_sync(mddev_t *mddev, int blocks, int ok) void md_done_sync(struct mddev *mddev, int blocks, int ok)
{ {
/* another "blocks" (512byte) blocks have been synced */ /* another "blocks" (512byte) blocks have been synced */
atomic_sub(blocks, &mddev->recovery_active); atomic_sub(blocks, &mddev->recovery_active);
...@@ -6891,7 +6891,7 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok) ...@@ -6891,7 +6891,7 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok)
* in superblock) before writing, schedule a superblock update * in superblock) before writing, schedule a superblock update
* and wait for it to complete. * and wait for it to complete.
*/ */
void md_write_start(mddev_t *mddev, struct bio *bi) void md_write_start(struct mddev *mddev, struct bio *bi)
{ {
int did_change = 0; int did_change = 0;
if (bio_data_dir(bi) != WRITE) if (bio_data_dir(bi) != WRITE)
...@@ -6926,7 +6926,7 @@ void md_write_start(mddev_t *mddev, struct bio *bi) ...@@ -6926,7 +6926,7 @@ void md_write_start(mddev_t *mddev, struct bio *bi)
!test_bit(MD_CHANGE_PENDING, &mddev->flags)); !test_bit(MD_CHANGE_PENDING, &mddev->flags));
} }
void md_write_end(mddev_t *mddev) void md_write_end(struct mddev *mddev)
{ {
if (atomic_dec_and_test(&mddev->writes_pending)) { if (atomic_dec_and_test(&mddev->writes_pending)) {
if (mddev->safemode == 2) if (mddev->safemode == 2)
...@@ -6945,7 +6945,7 @@ void md_write_end(mddev_t *mddev) ...@@ -6945,7 +6945,7 @@ void md_write_end(mddev_t *mddev)
* In the ->external case MD_CHANGE_CLEAN can not be cleared until mddev->lock * In the ->external case MD_CHANGE_CLEAN can not be cleared until mddev->lock
* is dropped, so return -EAGAIN after notifying userspace. * is dropped, so return -EAGAIN after notifying userspace.
*/ */
int md_allow_write(mddev_t *mddev) int md_allow_write(struct mddev *mddev)
{ {
if (!mddev->pers) if (!mddev->pers)
return 0; return 0;
...@@ -6977,9 +6977,9 @@ EXPORT_SYMBOL_GPL(md_allow_write); ...@@ -6977,9 +6977,9 @@ EXPORT_SYMBOL_GPL(md_allow_write);
#define SYNC_MARKS 10 #define SYNC_MARKS 10
#define SYNC_MARK_STEP (3*HZ) #define SYNC_MARK_STEP (3*HZ)
void md_do_sync(mddev_t *mddev) void md_do_sync(struct mddev *mddev)
{ {
mddev_t *mddev2; struct mddev *mddev2;
unsigned int currspeed = 0, unsigned int currspeed = 0,
window; window;
sector_t max_sectors,j, io_sectors; sector_t max_sectors,j, io_sectors;
...@@ -7304,7 +7304,7 @@ void md_do_sync(mddev_t *mddev) ...@@ -7304,7 +7304,7 @@ void md_do_sync(mddev_t *mddev)
} }
EXPORT_SYMBOL_GPL(md_do_sync); EXPORT_SYMBOL_GPL(md_do_sync);
static int remove_and_add_spares(mddev_t *mddev) static int remove_and_add_spares(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
int spares = 0; int spares = 0;
...@@ -7348,7 +7348,7 @@ static int remove_and_add_spares(mddev_t *mddev) ...@@ -7348,7 +7348,7 @@ static int remove_and_add_spares(mddev_t *mddev)
return spares; return spares;
} }
static void reap_sync_thread(mddev_t *mddev) static void reap_sync_thread(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -7409,7 +7409,7 @@ static void reap_sync_thread(mddev_t *mddev) ...@@ -7409,7 +7409,7 @@ static void reap_sync_thread(mddev_t *mddev)
* 5/ If array is degraded, try to add spares devices * 5/ If array is degraded, try to add spares devices
* 6/ If array has spares or is not in-sync, start a resync thread. * 6/ If array has spares or is not in-sync, start a resync thread.
*/ */
void md_check_recovery(mddev_t *mddev) void md_check_recovery(struct mddev *mddev)
{ {
if (mddev->suspended) if (mddev->suspended)
return; return;
...@@ -7569,7 +7569,7 @@ void md_check_recovery(mddev_t *mddev) ...@@ -7569,7 +7569,7 @@ void md_check_recovery(mddev_t *mddev)
} }
} }
void md_wait_for_blocked_rdev(struct md_rdev *rdev, mddev_t *mddev) void md_wait_for_blocked_rdev(struct md_rdev *rdev, struct mddev *mddev)
{ {
sysfs_notify_dirent_safe(rdev->sysfs_state); sysfs_notify_dirent_safe(rdev->sysfs_state);
wait_event_timeout(rdev->blocked_wait, wait_event_timeout(rdev->blocked_wait,
...@@ -8070,7 +8070,7 @@ static int md_notify_reboot(struct notifier_block *this, ...@@ -8070,7 +8070,7 @@ static int md_notify_reboot(struct notifier_block *this,
unsigned long code, void *x) unsigned long code, void *x)
{ {
struct list_head *tmp; struct list_head *tmp;
mddev_t *mddev; struct mddev *mddev;
int need_delay = 0; int need_delay = 0;
if ((code == SYS_DOWN) || (code == SYS_HALT) || (code == SYS_POWER_OFF)) { if ((code == SYS_DOWN) || (code == SYS_HALT) || (code == SYS_POWER_OFF)) {
...@@ -8223,7 +8223,7 @@ static void autostart_arrays(int part) ...@@ -8223,7 +8223,7 @@ static void autostart_arrays(int part)
static __exit void md_exit(void) static __exit void md_exit(void)
{ {
mddev_t *mddev; struct mddev *mddev;
struct list_head *tmp; struct list_head *tmp;
blk_unregister_region(MKDEV(MD_MAJOR,0), 1U << MINORBITS); blk_unregister_region(MKDEV(MD_MAJOR,0), 1U << MINORBITS);
......
drivers/md/md.h
View file @ fd01b88c
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#define MaxSector (~(sector_t)0) #define MaxSector (~(sector_t)0)
typedef struct mddev_s mddev_t;
/* Bad block numbers are stored sorted in a single page. /* Bad block numbers are stored sorted in a single page.
* 64bits is used for each block or extent. * 64bits is used for each block or extent.
* 54 bits are sector number, 9 bits are extent size, * 54 bits are sector number, 9 bits are extent size,
...@@ -42,7 +40,7 @@ struct md_rdev { ...@@ -42,7 +40,7 @@ struct md_rdev {
struct list_head same_set; /* RAID devices within the same set */ struct list_head same_set; /* RAID devices within the same set */
sector_t sectors; /* Device size (in 512bytes sectors) */ sector_t sectors; /* Device size (in 512bytes sectors) */
mddev_t *mddev; /* RAID array if running */ struct mddev *mddev; /* RAID array if running */
int last_events; /* IO event timestamp */ int last_events; /* IO event timestamp */
/* /*
...@@ -184,8 +182,7 @@ extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors, ...@@ -184,8 +182,7 @@ extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors); extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors);
extern void md_ack_all_badblocks(struct badblocks *bb); extern void md_ack_all_badblocks(struct badblocks *bb);
struct mddev_s struct mddev {
{
void *private; void *private;
struct mdk_personality *pers; struct mdk_personality *pers;
dev_t unit; dev_t unit;
...@@ -400,11 +397,11 @@ struct mddev_s ...@@ -400,11 +397,11 @@ struct mddev_s
atomic_t flush_pending; atomic_t flush_pending;
struct work_struct flush_work; struct work_struct flush_work;
struct work_struct event_work; /* used by dm to report failure event */ struct work_struct event_work; /* used by dm to report failure event */
void (*sync_super)(mddev_t *mddev, struct md_rdev *rdev); void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
}; };
static inline void rdev_dec_pending(struct md_rdev *rdev, mddev_t *mddev) static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
{ {
int faulty = test_bit(Faulty, &rdev->flags); int faulty = test_bit(Faulty, &rdev->flags);
if (atomic_dec_and_test(&rdev->nr_pending) && faulty) if (atomic_dec_and_test(&rdev->nr_pending) && faulty)
...@@ -422,29 +419,29 @@ struct mdk_personality ...@@ -422,29 +419,29 @@ struct mdk_personality
int level; int level;
struct list_head list; struct list_head list;
struct module *owner; struct module *owner;
int (*make_request)(mddev_t *mddev, struct bio *bio); int (*make_request)(struct mddev *mddev, struct bio *bio);
int (*run)(mddev_t *mddev); int (*run)(struct mddev *mddev);
int (*stop)(mddev_t *mddev); int (*stop)(struct mddev *mddev);
void (*status)(struct seq_file *seq, mddev_t *mddev); void (*status)(struct seq_file *seq, struct mddev *mddev);
/* error_handler must set ->faulty and clear ->in_sync /* error_handler must set ->faulty and clear ->in_sync
* if appropriate, and should abort recovery if needed * if appropriate, and should abort recovery if needed
*/ */
void (*error_handler)(mddev_t *mddev, struct md_rdev *rdev); void (*error_handler)(struct mddev *mddev, struct md_rdev *rdev);
int (*hot_add_disk) (mddev_t *mddev, struct md_rdev *rdev); int (*hot_add_disk) (struct mddev *mddev, struct md_rdev *rdev);
int (*hot_remove_disk) (mddev_t *mddev, int number); int (*hot_remove_disk) (struct mddev *mddev, int number);
int (*spare_active) (mddev_t *mddev); int (*spare_active) (struct mddev *mddev);
sector_t (*sync_request)(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster); sector_t (*sync_request)(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster);
int (*resize) (mddev_t *mddev, sector_t sectors); int (*resize) (struct mddev *mddev, sector_t sectors);
sector_t (*size) (mddev_t *mddev, sector_t sectors, int raid_disks); sector_t (*size) (struct mddev *mddev, sector_t sectors, int raid_disks);
int (*check_reshape) (mddev_t *mddev); int (*check_reshape) (struct mddev *mddev);
int (*start_reshape) (mddev_t *mddev); int (*start_reshape) (struct mddev *mddev);
void (*finish_reshape) (mddev_t *mddev); void (*finish_reshape) (struct mddev *mddev);
/* quiesce moves between quiescence states /* quiesce moves between quiescence states
* 0 - fully active * 0 - fully active
* 1 - no new requests allowed * 1 - no new requests allowed
* others - reserved * others - reserved
*/ */
void (*quiesce) (mddev_t *mddev, int state); void (*quiesce) (struct mddev *mddev, int state);
/* takeover is used to transition an array from one /* takeover is used to transition an array from one
* personality to another. The new personality must be able * personality to another. The new personality must be able
* to handle the data in the current layout. * to handle the data in the current layout.
...@@ -454,14 +451,14 @@ struct mdk_personality ...@@ -454,14 +451,14 @@ struct mdk_personality
* This needs to be installed and then ->run used to activate the * This needs to be installed and then ->run used to activate the
* array. * array.
*/ */
void *(*takeover) (mddev_t *mddev); void *(*takeover) (struct mddev *mddev);
}; };
struct md_sysfs_entry { struct md_sysfs_entry {
struct attribute attr; struct attribute attr;
ssize_t (*show)(mddev_t *, char *); ssize_t (*show)(struct mddev *, char *);
ssize_t (*store)(mddev_t *, const char *, size_t); ssize_t (*store)(struct mddev *, const char *, size_t);
}; };
extern struct attribute_group md_bitmap_group; extern struct attribute_group md_bitmap_group;
...@@ -477,19 +474,19 @@ static inline void sysfs_notify_dirent_safe(struct sysfs_dirent *sd) ...@@ -477,19 +474,19 @@ static inline void sysfs_notify_dirent_safe(struct sysfs_dirent *sd)
sysfs_notify_dirent(sd); sysfs_notify_dirent(sd);
} }
static inline char * mdname (mddev_t * mddev) static inline char * mdname (struct mddev * mddev)
{ {
return mddev->gendisk ? mddev->gendisk->disk_name : "mdX"; return mddev->gendisk ? mddev->gendisk->disk_name : "mdX";
} }
static inline int sysfs_link_rdev(mddev_t *mddev, struct md_rdev *rdev) static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev)
{ {
char nm[20]; char nm[20];
sprintf(nm, "rd%d", rdev->raid_disk); sprintf(nm, "rd%d", rdev->raid_disk);
return sysfs_create_link(&mddev->kobj, &rdev->kobj, nm); return sysfs_create_link(&mddev->kobj, &rdev->kobj, nm);
} }
static inline void sysfs_unlink_rdev(mddev_t *mddev, struct md_rdev *rdev) static inline void sysfs_unlink_rdev(struct mddev *mddev, struct md_rdev *rdev)
{ {
char nm[20]; char nm[20];
sprintf(nm, "rd%d", rdev->raid_disk); sprintf(nm, "rd%d", rdev->raid_disk);
...@@ -513,8 +510,8 @@ static inline void sysfs_unlink_rdev(mddev_t *mddev, struct md_rdev *rdev) ...@@ -513,8 +510,8 @@ static inline void sysfs_unlink_rdev(mddev_t *mddev, struct md_rdev *rdev)
list_for_each_entry_rcu(rdev, &((mddev)->disks), same_set) list_for_each_entry_rcu(rdev, &((mddev)->disks), same_set)
typedef struct mdk_thread_s { typedef struct mdk_thread_s {
void (*run) (mddev_t *mddev); void (*run) (struct mddev *mddev);
mddev_t *mddev; struct mddev *mddev;
wait_queue_head_t wqueue; wait_queue_head_t wqueue;
unsigned long flags; unsigned long flags;
struct task_struct *tsk; struct task_struct *tsk;
...@@ -556,46 +553,46 @@ static inline void safe_put_page(struct page *p) ...@@ -556,46 +553,46 @@ static inline void safe_put_page(struct page *p)
extern int register_md_personality(struct mdk_personality *p); extern int register_md_personality(struct mdk_personality *p);
extern int unregister_md_personality(struct mdk_personality *p); extern int unregister_md_personality(struct mdk_personality *p);
extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev), extern mdk_thread_t * md_register_thread(void (*run) (struct mddev *mddev),
mddev_t *mddev, const char *name); struct mddev *mddev, const char *name);
extern void md_unregister_thread(mdk_thread_t **threadp); extern void md_unregister_thread(mdk_thread_t **threadp);
extern void md_wakeup_thread(mdk_thread_t *thread); extern void md_wakeup_thread(mdk_thread_t *thread);
extern void md_check_recovery(mddev_t *mddev); extern void md_check_recovery(struct mddev *mddev);
extern void md_write_start(mddev_t *mddev, struct bio *bi); extern void md_write_start(struct mddev *mddev, struct bio *bi);
extern void md_write_end(mddev_t *mddev); extern void md_write_end(struct mddev *mddev);
extern void md_done_sync(mddev_t *mddev, int blocks, int ok); extern void md_done_sync(struct mddev *mddev, int blocks, int ok);
extern void md_error(mddev_t *mddev, struct md_rdev *rdev); extern void md_error(struct mddev *mddev, struct md_rdev *rdev);
extern int mddev_congested(mddev_t *mddev, int bits); extern int mddev_congested(struct mddev *mddev, int bits);
extern void md_flush_request(mddev_t *mddev, struct bio *bio); extern void md_flush_request(struct mddev *mddev, struct bio *bio);
extern void md_super_write(mddev_t *mddev, struct md_rdev *rdev, extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev,
sector_t sector, int size, struct page *page); sector_t sector, int size, struct page *page);
extern void md_super_wait(mddev_t *mddev); extern void md_super_wait(struct mddev *mddev);
extern int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, extern int sync_page_io(struct md_rdev *rdev, sector_t sector, int size,
struct page *page, int rw, bool metadata_op); struct page *page, int rw, bool metadata_op);
extern void md_do_sync(mddev_t *mddev); extern void md_do_sync(struct mddev *mddev);
extern void md_new_event(mddev_t *mddev); extern void md_new_event(struct mddev *mddev);
extern int md_allow_write(mddev_t *mddev); extern int md_allow_write(struct mddev *mddev);
extern void md_wait_for_blocked_rdev(struct md_rdev *rdev, mddev_t *mddev); extern void md_wait_for_blocked_rdev(struct md_rdev *rdev, struct mddev *mddev);
extern void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors); extern void md_set_array_sectors(struct mddev *mddev, sector_t array_sectors);
extern int md_check_no_bitmap(mddev_t *mddev); extern int md_check_no_bitmap(struct mddev *mddev);
extern int md_integrity_register(mddev_t *mddev); extern int md_integrity_register(struct mddev *mddev);
extern void md_integrity_add_rdev(struct md_rdev *rdev, mddev_t *mddev); extern void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev);
extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale); extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
extern void restore_bitmap_write_access(struct file *file); extern void restore_bitmap_write_access(struct file *file);
extern void mddev_init(mddev_t *mddev); extern void mddev_init(struct mddev *mddev);
extern int md_run(mddev_t *mddev); extern int md_run(struct mddev *mddev);
extern void md_stop(mddev_t *mddev); extern void md_stop(struct mddev *mddev);
extern void md_stop_writes(mddev_t *mddev); extern void md_stop_writes(struct mddev *mddev);
extern int md_rdev_init(struct md_rdev *rdev); extern int md_rdev_init(struct md_rdev *rdev);
extern void mddev_suspend(mddev_t *mddev); extern void mddev_suspend(struct mddev *mddev);
extern void mddev_resume(mddev_t *mddev); extern void mddev_resume(struct mddev *mddev);
extern struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask, extern struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,
mddev_t *mddev); struct mddev *mddev);
extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
mddev_t *mddev); struct mddev *mddev);
extern int mddev_check_plugged(mddev_t *mddev); extern int mddev_check_plugged(struct mddev *mddev);
extern void md_trim_bio(struct bio *bio, int offset, int size); extern void md_trim_bio(struct bio *bio, int offset, int size);
#endif /* _MD_MD_H */ #endif /* _MD_MD_H */
drivers/md/multipath.c
View file @ fd01b88c
...@@ -58,7 +58,7 @@ static int multipath_map (multipath_conf_t *conf) ...@@ -58,7 +58,7 @@ static int multipath_map (multipath_conf_t *conf)
static void multipath_reschedule_retry (struct multipath_bh *mp_bh) static void multipath_reschedule_retry (struct multipath_bh *mp_bh)
{ {
unsigned long flags; unsigned long flags;
mddev_t *mddev = mp_bh->mddev; struct mddev *mddev = mp_bh->mddev;
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
spin_lock_irqsave(&conf->device_lock, flags); spin_lock_irqsave(&conf->device_lock, flags);
...@@ -106,7 +106,7 @@ static void multipath_end_request(struct bio *bio, int error) ...@@ -106,7 +106,7 @@ static void multipath_end_request(struct bio *bio, int error)
rdev_dec_pending(rdev, conf->mddev); rdev_dec_pending(rdev, conf->mddev);
} }
static int multipath_make_request(mddev_t *mddev, struct bio * bio) static int multipath_make_request(struct mddev *mddev, struct bio * bio)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
struct multipath_bh * mp_bh; struct multipath_bh * mp_bh;
...@@ -140,7 +140,7 @@ static int multipath_make_request(mddev_t *mddev, struct bio * bio) ...@@ -140,7 +140,7 @@ static int multipath_make_request(mddev_t *mddev, struct bio * bio)
return 0; return 0;
} }
static void multipath_status (struct seq_file *seq, mddev_t *mddev) static void multipath_status (struct seq_file *seq, struct mddev *mddev)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
int i; int i;
...@@ -156,7 +156,7 @@ static void multipath_status (struct seq_file *seq, mddev_t *mddev) ...@@ -156,7 +156,7 @@ static void multipath_status (struct seq_file *seq, mddev_t *mddev)
static int multipath_congested(void *data, int bits) static int multipath_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
int i, ret = 0; int i, ret = 0;
...@@ -183,7 +183,7 @@ static int multipath_congested(void *data, int bits) ...@@ -183,7 +183,7 @@ static int multipath_congested(void *data, int bits)
/* /*
* Careful, this can execute in IRQ contexts as well! * Careful, this can execute in IRQ contexts as well!
*/ */
static void multipath_error (mddev_t *mddev, struct md_rdev *rdev) static void multipath_error (struct mddev *mddev, struct md_rdev *rdev)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
...@@ -242,7 +242,7 @@ static void print_multipath_conf (multipath_conf_t *conf) ...@@ -242,7 +242,7 @@ static void print_multipath_conf (multipath_conf_t *conf)
} }
static int multipath_add_disk(mddev_t *mddev, struct md_rdev *rdev) static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
struct request_queue *q; struct request_queue *q;
...@@ -291,7 +291,7 @@ static int multipath_add_disk(mddev_t *mddev, struct md_rdev *rdev) ...@@ -291,7 +291,7 @@ static int multipath_add_disk(mddev_t *mddev, struct md_rdev *rdev)
return err; return err;
} }
static int multipath_remove_disk(mddev_t *mddev, int number) static int multipath_remove_disk(struct mddev *mddev, int number)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
int err = 0; int err = 0;
...@@ -335,7 +335,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number) ...@@ -335,7 +335,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
* 3. Performs writes following reads for array syncronising. * 3. Performs writes following reads for array syncronising.
*/ */
static void multipathd (mddev_t *mddev) static void multipathd (struct mddev *mddev)
{ {
struct multipath_bh *mp_bh; struct multipath_bh *mp_bh;
struct bio *bio; struct bio *bio;
...@@ -379,7 +379,7 @@ static void multipathd (mddev_t *mddev) ...@@ -379,7 +379,7 @@ static void multipathd (mddev_t *mddev)
spin_unlock_irqrestore(&conf->device_lock, flags); spin_unlock_irqrestore(&conf->device_lock, flags);
} }
static sector_t multipath_size(mddev_t *mddev, sector_t sectors, int raid_disks) static sector_t multipath_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
WARN_ONCE(sectors || raid_disks, WARN_ONCE(sectors || raid_disks,
"%s does not support generic reshape\n", __func__); "%s does not support generic reshape\n", __func__);
...@@ -387,7 +387,7 @@ static sector_t multipath_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -387,7 +387,7 @@ static sector_t multipath_size(mddev_t *mddev, sector_t sectors, int raid_disks)
return mddev->dev_sectors; return mddev->dev_sectors;
} }
static int multipath_run (mddev_t *mddev) static int multipath_run (struct mddev *mddev)
{ {
multipath_conf_t *conf; multipath_conf_t *conf;
int disk_idx; int disk_idx;
...@@ -510,7 +510,7 @@ static int multipath_run (mddev_t *mddev) ...@@ -510,7 +510,7 @@ static int multipath_run (mddev_t *mddev)
} }
static int multipath_stop (mddev_t *mddev) static int multipath_stop (struct mddev *mddev)
{ {
multipath_conf_t *conf = mddev->private; multipath_conf_t *conf = mddev->private;
......
drivers/md/multipath.h
View file @ fd01b88c
...@@ -6,7 +6,7 @@ struct multipath_info { ...@@ -6,7 +6,7 @@ struct multipath_info {
}; };
struct multipath_private_data { struct multipath_private_data {
mddev_t *mddev; struct mddev *mddev;
struct multipath_info *multipaths; struct multipath_info *multipaths;
int raid_disks; int raid_disks;
spinlock_t device_lock; spinlock_t device_lock;
...@@ -24,7 +24,7 @@ typedef struct multipath_private_data multipath_conf_t; ...@@ -24,7 +24,7 @@ typedef struct multipath_private_data multipath_conf_t;
*/ */
struct multipath_bh { struct multipath_bh {
mddev_t *mddev; struct mddev *mddev;
struct bio *master_bio; struct bio *master_bio;
struct bio bio; struct bio bio;
int path; int path;
......
drivers/md/raid0.c
View file @ fd01b88c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
static int raid0_congested(void *data, int bits) static int raid0_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
raid0_conf_t *conf = mddev->private; raid0_conf_t *conf = mddev->private;
struct md_rdev **devlist = conf->devlist; struct md_rdev **devlist = conf->devlist;
int raid_disks = conf->strip_zone[0].nb_dev; int raid_disks = conf->strip_zone[0].nb_dev;
...@@ -47,7 +47,7 @@ static int raid0_congested(void *data, int bits) ...@@ -47,7 +47,7 @@ static int raid0_congested(void *data, int bits)
/* /*
* inform the user of the raid configuration * inform the user of the raid configuration
*/ */
static void dump_zones(mddev_t *mddev) static void dump_zones(struct mddev *mddev)
{ {
int j, k; int j, k;
sector_t zone_size = 0; sector_t zone_size = 0;
...@@ -77,7 +77,7 @@ static void dump_zones(mddev_t *mddev) ...@@ -77,7 +77,7 @@ static void dump_zones(mddev_t *mddev)
printk(KERN_INFO "\n"); printk(KERN_INFO "\n");
} }
static int create_strip_zones(mddev_t *mddev, raid0_conf_t **private_conf) static int create_strip_zones(struct mddev *mddev, raid0_conf_t **private_conf)
{ {
int i, c, err; int i, c, err;
sector_t curr_zone_end, sectors; sector_t curr_zone_end, sectors;
...@@ -301,7 +301,7 @@ static int raid0_mergeable_bvec(struct request_queue *q, ...@@ -301,7 +301,7 @@ static int raid0_mergeable_bvec(struct request_queue *q,
struct bvec_merge_data *bvm, struct bvec_merge_data *bvm,
struct bio_vec *biovec) struct bio_vec *biovec)
{ {
mddev_t *mddev = q->queuedata; struct mddev *mddev = q->queuedata;
sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
int max; int max;
unsigned int chunk_sectors = mddev->chunk_sectors; unsigned int chunk_sectors = mddev->chunk_sectors;
...@@ -320,7 +320,7 @@ static int raid0_mergeable_bvec(struct request_queue *q, ...@@ -320,7 +320,7 @@ static int raid0_mergeable_bvec(struct request_queue *q,
return max; return max;
} }
static sector_t raid0_size(mddev_t *mddev, sector_t sectors, int raid_disks) static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
sector_t array_sectors = 0; sector_t array_sectors = 0;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -334,7 +334,7 @@ static sector_t raid0_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -334,7 +334,7 @@ static sector_t raid0_size(mddev_t *mddev, sector_t sectors, int raid_disks)
return array_sectors; return array_sectors;
} }
static int raid0_run(mddev_t *mddev) static int raid0_run(struct mddev *mddev)
{ {
raid0_conf_t *conf; raid0_conf_t *conf;
int ret; int ret;
...@@ -384,7 +384,7 @@ static int raid0_run(mddev_t *mddev) ...@@ -384,7 +384,7 @@ static int raid0_run(mddev_t *mddev)
return md_integrity_register(mddev); return md_integrity_register(mddev);
} }
static int raid0_stop(mddev_t *mddev) static int raid0_stop(struct mddev *mddev)
{ {
raid0_conf_t *conf = mddev->private; raid0_conf_t *conf = mddev->private;
...@@ -419,7 +419,7 @@ static struct strip_zone *find_zone(struct raid0_private_data *conf, ...@@ -419,7 +419,7 @@ static struct strip_zone *find_zone(struct raid0_private_data *conf,
* remaps the bio to the target device. we separate two flows. * remaps the bio to the target device. we separate two flows.
* power 2 flow and a general flow for the sake of perfromance * power 2 flow and a general flow for the sake of perfromance
*/ */
static struct md_rdev *map_sector(mddev_t *mddev, struct strip_zone *zone, static struct md_rdev *map_sector(struct mddev *mddev, struct strip_zone *zone,
sector_t sector, sector_t *sector_offset) sector_t sector, sector_t *sector_offset)
{ {
unsigned int sect_in_chunk; unsigned int sect_in_chunk;
...@@ -455,7 +455,7 @@ static struct md_rdev *map_sector(mddev_t *mddev, struct strip_zone *zone, ...@@ -455,7 +455,7 @@ static struct md_rdev *map_sector(mddev_t *mddev, struct strip_zone *zone,
/* /*
* Is io distribute over 1 or more chunks ? * Is io distribute over 1 or more chunks ?
*/ */
static inline int is_io_in_chunk_boundary(mddev_t *mddev, static inline int is_io_in_chunk_boundary(struct mddev *mddev,
unsigned int chunk_sects, struct bio *bio) unsigned int chunk_sects, struct bio *bio)
{ {
if (likely(is_power_of_2(chunk_sects))) { if (likely(is_power_of_2(chunk_sects))) {
...@@ -468,7 +468,7 @@ static inline int is_io_in_chunk_boundary(mddev_t *mddev, ...@@ -468,7 +468,7 @@ static inline int is_io_in_chunk_boundary(mddev_t *mddev,
} }
} }
static int raid0_make_request(mddev_t *mddev, struct bio *bio) static int raid0_make_request(struct mddev *mddev, struct bio *bio)
{ {
unsigned int chunk_sects; unsigned int chunk_sects;
sector_t sector_offset; sector_t sector_offset;
...@@ -528,13 +528,13 @@ static int raid0_make_request(mddev_t *mddev, struct bio *bio) ...@@ -528,13 +528,13 @@ static int raid0_make_request(mddev_t *mddev, struct bio *bio)
return 0; return 0;
} }
static void raid0_status(struct seq_file *seq, mddev_t *mddev) static void raid0_status(struct seq_file *seq, struct mddev *mddev)
{ {
seq_printf(seq, " %dk chunks", mddev->chunk_sectors / 2); seq_printf(seq, " %dk chunks", mddev->chunk_sectors / 2);
return; return;
} }
static void *raid0_takeover_raid45(mddev_t *mddev) static void *raid0_takeover_raid45(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
raid0_conf_t *priv_conf; raid0_conf_t *priv_conf;
...@@ -568,7 +568,7 @@ static void *raid0_takeover_raid45(mddev_t *mddev) ...@@ -568,7 +568,7 @@ static void *raid0_takeover_raid45(mddev_t *mddev)
return priv_conf; return priv_conf;
} }
static void *raid0_takeover_raid10(mddev_t *mddev) static void *raid0_takeover_raid10(struct mddev *mddev)
{ {
raid0_conf_t *priv_conf; raid0_conf_t *priv_conf;
...@@ -609,7 +609,7 @@ static void *raid0_takeover_raid10(mddev_t *mddev) ...@@ -609,7 +609,7 @@ static void *raid0_takeover_raid10(mddev_t *mddev)
return priv_conf; return priv_conf;
} }
static void *raid0_takeover_raid1(mddev_t *mddev) static void *raid0_takeover_raid1(struct mddev *mddev)
{ {
raid0_conf_t *priv_conf; raid0_conf_t *priv_conf;
...@@ -635,7 +635,7 @@ static void *raid0_takeover_raid1(mddev_t *mddev) ...@@ -635,7 +635,7 @@ static void *raid0_takeover_raid1(mddev_t *mddev)
return priv_conf; return priv_conf;
} }
static void *raid0_takeover(mddev_t *mddev) static void *raid0_takeover(struct mddev *mddev)
{ {
/* raid0 can take over: /* raid0 can take over:
* raid4 - if all data disks are active. * raid4 - if all data disks are active.
...@@ -666,7 +666,7 @@ static void *raid0_takeover(mddev_t *mddev) ...@@ -666,7 +666,7 @@ static void *raid0_takeover(mddev_t *mddev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static void raid0_quiesce(mddev_t *mddev, int state) static void raid0_quiesce(struct mddev *mddev, int state)
{ {
} }
......
drivers/md/raid1.c
View file @ fd01b88c
...@@ -193,7 +193,7 @@ static void put_buf(r1bio_t *r1_bio) ...@@ -193,7 +193,7 @@ static void put_buf(r1bio_t *r1_bio)
static void reschedule_retry(r1bio_t *r1_bio) static void reschedule_retry(r1bio_t *r1_bio)
{ {
unsigned long flags; unsigned long flags;
mddev_t *mddev = r1_bio->mddev; struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
spin_lock_irqsave(&conf->device_lock, flags); spin_lock_irqsave(&conf->device_lock, flags);
...@@ -593,7 +593,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio, int *max_sectors) ...@@ -593,7 +593,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio, int *max_sectors)
return best_disk; return best_disk;
} }
int md_raid1_congested(mddev_t *mddev, int bits) int md_raid1_congested(struct mddev *mddev, int bits)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i, ret = 0; int i, ret = 0;
...@@ -622,7 +622,7 @@ EXPORT_SYMBOL_GPL(md_raid1_congested); ...@@ -622,7 +622,7 @@ EXPORT_SYMBOL_GPL(md_raid1_congested);
static int raid1_congested(void *data, int bits) static int raid1_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
return mddev_congested(mddev, bits) || return mddev_congested(mddev, bits) ||
md_raid1_congested(mddev, bits); md_raid1_congested(mddev, bits);
...@@ -796,7 +796,7 @@ static void alloc_behind_pages(struct bio *bio, r1bio_t *r1_bio) ...@@ -796,7 +796,7 @@ static void alloc_behind_pages(struct bio *bio, r1bio_t *r1_bio)
pr_debug("%dB behind alloc failed, doing sync I/O\n", bio->bi_size); pr_debug("%dB behind alloc failed, doing sync I/O\n", bio->bi_size);
} }
static int make_request(mddev_t *mddev, struct bio * bio) static int make_request(struct mddev *mddev, struct bio * bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
mirror_info_t *mirror; mirror_info_t *mirror;
...@@ -1138,7 +1138,7 @@ static int make_request(mddev_t *mddev, struct bio * bio) ...@@ -1138,7 +1138,7 @@ static int make_request(mddev_t *mddev, struct bio * bio)
return 0; return 0;
} }
static void status(struct seq_file *seq, mddev_t *mddev) static void status(struct seq_file *seq, struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i; int i;
...@@ -1156,7 +1156,7 @@ static void status(struct seq_file *seq, mddev_t *mddev) ...@@ -1156,7 +1156,7 @@ static void status(struct seq_file *seq, mddev_t *mddev)
} }
static void error(mddev_t *mddev, struct md_rdev *rdev) static void error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -1233,7 +1233,7 @@ static void close_sync(conf_t *conf) ...@@ -1233,7 +1233,7 @@ static void close_sync(conf_t *conf)
conf->r1buf_pool = NULL; conf->r1buf_pool = NULL;
} }
static int raid1_spare_active(mddev_t *mddev) static int raid1_spare_active(struct mddev *mddev)
{ {
int i; int i;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -1263,7 +1263,7 @@ static int raid1_spare_active(mddev_t *mddev) ...@@ -1263,7 +1263,7 @@ static int raid1_spare_active(mddev_t *mddev)
} }
static int raid1_add_disk(mddev_t *mddev, struct md_rdev *rdev) static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int err = -EEXIST; int err = -EEXIST;
...@@ -1311,7 +1311,7 @@ static int raid1_add_disk(mddev_t *mddev, struct md_rdev *rdev) ...@@ -1311,7 +1311,7 @@ static int raid1_add_disk(mddev_t *mddev, struct md_rdev *rdev)
return err; return err;
} }
static int raid1_remove_disk(mddev_t *mddev, int number) static int raid1_remove_disk(struct mddev *mddev, int number)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int err = 0; int err = 0;
...@@ -1374,7 +1374,7 @@ static void end_sync_write(struct bio *bio, int error) ...@@ -1374,7 +1374,7 @@ static void end_sync_write(struct bio *bio, int error)
{ {
int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
r1bio_t *r1_bio = bio->bi_private; r1bio_t *r1_bio = bio->bi_private;
mddev_t *mddev = r1_bio->mddev; struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int mirror=0; int mirror=0;
sector_t first_bad; sector_t first_bad;
...@@ -1446,7 +1446,7 @@ static int fix_sync_read_error(r1bio_t *r1_bio) ...@@ -1446,7 +1446,7 @@ static int fix_sync_read_error(r1bio_t *r1_bio)
* made sure that anything with a bad block in range * made sure that anything with a bad block in range
* will have bi_end_io clear. * will have bi_end_io clear.
*/ */
mddev_t *mddev = r1_bio->mddev; struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
struct bio *bio = r1_bio->bios[r1_bio->read_disk]; struct bio *bio = r1_bio->bios[r1_bio->read_disk];
sector_t sect = r1_bio->sector; sector_t sect = r1_bio->sector;
...@@ -1562,7 +1562,7 @@ static int process_checks(r1bio_t *r1_bio) ...@@ -1562,7 +1562,7 @@ static int process_checks(r1bio_t *r1_bio)
* If any blocks failed to read, then we need to * If any blocks failed to read, then we need to
* attempt an over-write * attempt an over-write
*/ */
mddev_t *mddev = r1_bio->mddev; struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int primary; int primary;
int i; int i;
...@@ -1635,7 +1635,7 @@ static int process_checks(r1bio_t *r1_bio) ...@@ -1635,7 +1635,7 @@ static int process_checks(r1bio_t *r1_bio)
return 0; return 0;
} }
static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) static void sync_request_write(struct mddev *mddev, r1bio_t *r1_bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i; int i;
...@@ -1690,7 +1690,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) ...@@ -1690,7 +1690,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
static void fix_read_error(conf_t *conf, int read_disk, static void fix_read_error(conf_t *conf, int read_disk,
sector_t sect, int sectors) sector_t sect, int sectors)
{ {
mddev_t *mddev = conf->mddev; struct mddev *mddev = conf->mddev;
while(sectors) { while(sectors) {
int s = sectors; int s = sectors;
int d = read_disk; int d = read_disk;
...@@ -1792,7 +1792,7 @@ static int submit_bio_wait(int rw, struct bio *bio) ...@@ -1792,7 +1792,7 @@ static int submit_bio_wait(int rw, struct bio *bio)
static int narrow_write_error(r1bio_t *r1_bio, int i) static int narrow_write_error(r1bio_t *r1_bio, int i)
{ {
mddev_t *mddev = r1_bio->mddev; struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
struct md_rdev *rdev = conf->mirrors[i].rdev; struct md_rdev *rdev = conf->mirrors[i].rdev;
int vcnt, idx; int vcnt, idx;
...@@ -1922,7 +1922,7 @@ static void handle_read_error(conf_t *conf, r1bio_t *r1_bio) ...@@ -1922,7 +1922,7 @@ static void handle_read_error(conf_t *conf, r1bio_t *r1_bio)
{ {
int disk; int disk;
int max_sectors; int max_sectors;
mddev_t *mddev = conf->mddev; struct mddev *mddev = conf->mddev;
struct bio *bio; struct bio *bio;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -2008,7 +2008,7 @@ static void handle_read_error(conf_t *conf, r1bio_t *r1_bio) ...@@ -2008,7 +2008,7 @@ static void handle_read_error(conf_t *conf, r1bio_t *r1_bio)
} }
} }
static void raid1d(mddev_t *mddev) static void raid1d(struct mddev *mddev)
{ {
r1bio_t *r1_bio; r1bio_t *r1_bio;
unsigned long flags; unsigned long flags;
...@@ -2085,7 +2085,7 @@ static int init_resync(conf_t *conf) ...@@ -2085,7 +2085,7 @@ static int init_resync(conf_t *conf)
* that can be installed to exclude normal IO requests. * that can be installed to exclude normal IO requests.
*/ */
static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster) static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
r1bio_t *r1_bio; r1bio_t *r1_bio;
...@@ -2357,7 +2357,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i ...@@ -2357,7 +2357,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
return nr_sectors; return nr_sectors;
} }
static sector_t raid1_size(mddev_t *mddev, sector_t sectors, int raid_disks) static sector_t raid1_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
if (sectors) if (sectors)
return sectors; return sectors;
...@@ -2365,7 +2365,7 @@ static sector_t raid1_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -2365,7 +2365,7 @@ static sector_t raid1_size(mddev_t *mddev, sector_t sectors, int raid_disks)
return mddev->dev_sectors; return mddev->dev_sectors;
} }
static conf_t *setup_conf(mddev_t *mddev) static conf_t *setup_conf(struct mddev *mddev)
{ {
conf_t *conf; conf_t *conf;
int i; int i;
...@@ -2466,7 +2466,7 @@ static conf_t *setup_conf(mddev_t *mddev) ...@@ -2466,7 +2466,7 @@ static conf_t *setup_conf(mddev_t *mddev)
return ERR_PTR(err); return ERR_PTR(err);
} }
static int run(mddev_t *mddev) static int run(struct mddev *mddev)
{ {
conf_t *conf; conf_t *conf;
int i; int i;
...@@ -2546,7 +2546,7 @@ static int run(mddev_t *mddev) ...@@ -2546,7 +2546,7 @@ static int run(mddev_t *mddev)
return md_integrity_register(mddev); return md_integrity_register(mddev);
} }
static int stop(mddev_t *mddev) static int stop(struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
struct bitmap *bitmap = mddev->bitmap; struct bitmap *bitmap = mddev->bitmap;
...@@ -2573,7 +2573,7 @@ static int stop(mddev_t *mddev) ...@@ -2573,7 +2573,7 @@ static int stop(mddev_t *mddev)
return 0; return 0;
} }
static int raid1_resize(mddev_t *mddev, sector_t sectors) static int raid1_resize(struct mddev *mddev, sector_t sectors)
{ {
/* no resync is happening, and there is enough space /* no resync is happening, and there is enough space
* on all devices, so we can resize. * on all devices, so we can resize.
...@@ -2597,7 +2597,7 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors) ...@@ -2597,7 +2597,7 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors)
return 0; return 0;
} }
static int raid1_reshape(mddev_t *mddev) static int raid1_reshape(struct mddev *mddev)
{ {
/* We need to: /* We need to:
* 1/ resize the r1bio_pool * 1/ resize the r1bio_pool
...@@ -2703,7 +2703,7 @@ static int raid1_reshape(mddev_t *mddev) ...@@ -2703,7 +2703,7 @@ static int raid1_reshape(mddev_t *mddev)
return 0; return 0;
} }
static void raid1_quiesce(mddev_t *mddev, int state) static void raid1_quiesce(struct mddev *mddev, int state)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -2720,7 +2720,7 @@ static void raid1_quiesce(mddev_t *mddev, int state) ...@@ -2720,7 +2720,7 @@ static void raid1_quiesce(mddev_t *mddev, int state)
} }
} }
static void *raid1_takeover(mddev_t *mddev) static void *raid1_takeover(struct mddev *mddev)
{ {
/* raid1 can take over: /* raid1 can take over:
* raid5 with 2 devices, any layout or chunk size * raid5 with 2 devices, any layout or chunk size
......
drivers/md/raid1.h
View file @ fd01b88c
...@@ -17,7 +17,7 @@ struct mirror_info { ...@@ -17,7 +17,7 @@ struct mirror_info {
*/ */
struct pool_info { struct pool_info {
mddev_t *mddev; struct mddev *mddev;
int raid_disks; int raid_disks;
}; };
...@@ -25,7 +25,7 @@ struct pool_info { ...@@ -25,7 +25,7 @@ struct pool_info {
typedef struct r1bio_s r1bio_t; typedef struct r1bio_s r1bio_t;
struct r1_private_data_s { struct r1_private_data_s {
mddev_t *mddev; struct mddev *mddev;
mirror_info_t *mirrors; mirror_info_t *mirrors;
int raid_disks; int raid_disks;
...@@ -114,7 +114,7 @@ struct r1bio_s { ...@@ -114,7 +114,7 @@ struct r1bio_s {
sector_t sector; sector_t sector;
int sectors; int sectors;
unsigned long state; unsigned long state;
mddev_t *mddev; struct mddev *mddev;
/* /*
* original bio going to /dev/mdx * original bio going to /dev/mdx
*/ */
...@@ -173,6 +173,6 @@ struct r1bio_s { ...@@ -173,6 +173,6 @@ struct r1bio_s {
#define R1BIO_MadeGood 7 #define R1BIO_MadeGood 7
#define R1BIO_WriteError 8 #define R1BIO_WriteError 8
extern int md_raid1_congested(mddev_t *mddev, int bits); extern int md_raid1_congested(struct mddev *mddev, int bits);
#endif #endif
drivers/md/raid10.c
View file @ fd01b88c
...@@ -207,7 +207,7 @@ static void put_buf(r10bio_t *r10_bio) ...@@ -207,7 +207,7 @@ static void put_buf(r10bio_t *r10_bio)
static void reschedule_retry(r10bio_t *r10_bio) static void reschedule_retry(r10bio_t *r10_bio)
{ {
unsigned long flags; unsigned long flags;
mddev_t *mddev = r10_bio->mddev; struct mddev *mddev = r10_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
spin_lock_irqsave(&conf->device_lock, flags); spin_lock_irqsave(&conf->device_lock, flags);
...@@ -522,7 +522,7 @@ static int raid10_mergeable_bvec(struct request_queue *q, ...@@ -522,7 +522,7 @@ static int raid10_mergeable_bvec(struct request_queue *q,
struct bvec_merge_data *bvm, struct bvec_merge_data *bvm,
struct bio_vec *biovec) struct bio_vec *biovec)
{ {
mddev_t *mddev = q->queuedata; struct mddev *mddev = q->queuedata;
sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
int max; int max;
unsigned int chunk_sectors = mddev->chunk_sectors; unsigned int chunk_sectors = mddev->chunk_sectors;
...@@ -677,7 +677,7 @@ static int read_balance(conf_t *conf, r10bio_t *r10_bio, int *max_sectors) ...@@ -677,7 +677,7 @@ static int read_balance(conf_t *conf, r10bio_t *r10_bio, int *max_sectors)
static int raid10_congested(void *data, int bits) static int raid10_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i, ret = 0; int i, ret = 0;
...@@ -830,7 +830,7 @@ static void unfreeze_array(conf_t *conf) ...@@ -830,7 +830,7 @@ static void unfreeze_array(conf_t *conf)
spin_unlock_irq(&conf->resync_lock); spin_unlock_irq(&conf->resync_lock);
} }
static int make_request(mddev_t *mddev, struct bio * bio) static int make_request(struct mddev *mddev, struct bio * bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
mirror_info_t *mirror; mirror_info_t *mirror;
...@@ -1161,7 +1161,7 @@ static int make_request(mddev_t *mddev, struct bio * bio) ...@@ -1161,7 +1161,7 @@ static int make_request(mddev_t *mddev, struct bio * bio)
return 0; return 0;
} }
static void status(struct seq_file *seq, mddev_t *mddev) static void status(struct seq_file *seq, struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i; int i;
...@@ -1209,7 +1209,7 @@ static int enough(conf_t *conf, int ignore) ...@@ -1209,7 +1209,7 @@ static int enough(conf_t *conf, int ignore)
return 1; return 1;
} }
static void error(mddev_t *mddev, struct md_rdev *rdev) static void error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -1279,7 +1279,7 @@ static void close_sync(conf_t *conf) ...@@ -1279,7 +1279,7 @@ static void close_sync(conf_t *conf)
conf->r10buf_pool = NULL; conf->r10buf_pool = NULL;
} }
static int raid10_spare_active(mddev_t *mddev) static int raid10_spare_active(struct mddev *mddev)
{ {
int i; int i;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -1309,7 +1309,7 @@ static int raid10_spare_active(mddev_t *mddev) ...@@ -1309,7 +1309,7 @@ static int raid10_spare_active(mddev_t *mddev)
} }
static int raid10_add_disk(mddev_t *mddev, struct md_rdev *rdev) static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int err = -EEXIST; int err = -EEXIST;
...@@ -1368,7 +1368,7 @@ static int raid10_add_disk(mddev_t *mddev, struct md_rdev *rdev) ...@@ -1368,7 +1368,7 @@ static int raid10_add_disk(mddev_t *mddev, struct md_rdev *rdev)
return err; return err;
} }
static int raid10_remove_disk(mddev_t *mddev, int number) static int raid10_remove_disk(struct mddev *mddev, int number)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int err = 0; int err = 0;
...@@ -1441,7 +1441,7 @@ static void end_sync_read(struct bio *bio, int error) ...@@ -1441,7 +1441,7 @@ static void end_sync_read(struct bio *bio, int error)
static void end_sync_request(r10bio_t *r10_bio) static void end_sync_request(r10bio_t *r10_bio)
{ {
mddev_t *mddev = r10_bio->mddev; struct mddev *mddev = r10_bio->mddev;
while (atomic_dec_and_test(&r10_bio->remaining)) { while (atomic_dec_and_test(&r10_bio->remaining)) {
if (r10_bio->master_bio == NULL) { if (r10_bio->master_bio == NULL) {
...@@ -1470,7 +1470,7 @@ static void end_sync_write(struct bio *bio, int error) ...@@ -1470,7 +1470,7 @@ static void end_sync_write(struct bio *bio, int error)
{ {
int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
r10bio_t *r10_bio = bio->bi_private; r10bio_t *r10_bio = bio->bi_private;
mddev_t *mddev = r10_bio->mddev; struct mddev *mddev = r10_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int d; int d;
sector_t first_bad; sector_t first_bad;
...@@ -1509,7 +1509,7 @@ static void end_sync_write(struct bio *bio, int error) ...@@ -1509,7 +1509,7 @@ static void end_sync_write(struct bio *bio, int error)
* We check if all blocks are in-sync and only write to blocks that * We check if all blocks are in-sync and only write to blocks that
* aren't in sync * aren't in sync
*/ */
static void sync_request_write(mddev_t *mddev, r10bio_t *r10_bio) static void sync_request_write(struct mddev *mddev, r10bio_t *r10_bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int i, first; int i, first;
...@@ -1618,7 +1618,7 @@ static void fix_recovery_read_error(r10bio_t *r10_bio) ...@@ -1618,7 +1618,7 @@ static void fix_recovery_read_error(r10bio_t *r10_bio)
* If a read fails, record a bad block on both old and * If a read fails, record a bad block on both old and
* new devices. * new devices.
*/ */
mddev_t *mddev = r10_bio->mddev; struct mddev *mddev = r10_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
struct bio *bio = r10_bio->devs[0].bio; struct bio *bio = r10_bio->devs[0].bio;
sector_t sect = 0; sector_t sect = 0;
...@@ -1688,7 +1688,7 @@ static void fix_recovery_read_error(r10bio_t *r10_bio) ...@@ -1688,7 +1688,7 @@ static void fix_recovery_read_error(r10bio_t *r10_bio)
} }
} }
static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio) static void recovery_request_write(struct mddev *mddev, r10bio_t *r10_bio)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
int d; int d;
...@@ -1719,7 +1719,7 @@ static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio) ...@@ -1719,7 +1719,7 @@ static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio)
* since the last recorded read error. * since the last recorded read error.
* *
*/ */
static void check_decay_read_errors(mddev_t *mddev, struct md_rdev *rdev) static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
{ {
struct timespec cur_time_mon; struct timespec cur_time_mon;
unsigned long hours_since_last; unsigned long hours_since_last;
...@@ -1778,7 +1778,7 @@ static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector, ...@@ -1778,7 +1778,7 @@ static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
* 3. Performs writes following reads for array synchronising. * 3. Performs writes following reads for array synchronising.
*/ */
static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio) static void fix_read_error(conf_t *conf, struct mddev *mddev, r10bio_t *r10_bio)
{ {
int sect = 0; /* Offset from r10_bio->sector */ int sect = 0; /* Offset from r10_bio->sector */
int sectors = r10_bio->sectors; int sectors = r10_bio->sectors;
...@@ -1986,7 +1986,7 @@ static int submit_bio_wait(int rw, struct bio *bio) ...@@ -1986,7 +1986,7 @@ static int submit_bio_wait(int rw, struct bio *bio)
static int narrow_write_error(r10bio_t *r10_bio, int i) static int narrow_write_error(r10bio_t *r10_bio, int i)
{ {
struct bio *bio = r10_bio->master_bio; struct bio *bio = r10_bio->master_bio;
mddev_t *mddev = r10_bio->mddev; struct mddev *mddev = r10_bio->mddev;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
struct md_rdev *rdev = conf->mirrors[r10_bio->devs[i].devnum].rdev; struct md_rdev *rdev = conf->mirrors[r10_bio->devs[i].devnum].rdev;
/* bio has the data to be written to slot 'i' where /* bio has the data to be written to slot 'i' where
...@@ -2040,7 +2040,7 @@ static int narrow_write_error(r10bio_t *r10_bio, int i) ...@@ -2040,7 +2040,7 @@ static int narrow_write_error(r10bio_t *r10_bio, int i)
return ok; return ok;
} }
static void handle_read_error(mddev_t *mddev, r10bio_t *r10_bio) static void handle_read_error(struct mddev *mddev, r10bio_t *r10_bio)
{ {
int slot = r10_bio->read_slot; int slot = r10_bio->read_slot;
int mirror = r10_bio->devs[slot].devnum; int mirror = r10_bio->devs[slot].devnum;
...@@ -2200,7 +2200,7 @@ static void handle_write_completed(conf_t *conf, r10bio_t *r10_bio) ...@@ -2200,7 +2200,7 @@ static void handle_write_completed(conf_t *conf, r10bio_t *r10_bio)
} }
} }
static void raid10d(mddev_t *mddev) static void raid10d(struct mddev *mddev)
{ {
r10bio_t *r10_bio; r10bio_t *r10_bio;
unsigned long flags; unsigned long flags;
...@@ -2297,7 +2297,7 @@ static int init_resync(conf_t *conf) ...@@ -2297,7 +2297,7 @@ static int init_resync(conf_t *conf)
* *
*/ */
static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,
int *skipped, int go_faster) int *skipped, int go_faster)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -2714,7 +2714,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, ...@@ -2714,7 +2714,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr,
} }
static sector_t static sector_t
raid10_size(mddev_t *mddev, sector_t sectors, int raid_disks) raid10_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
sector_t size; sector_t size;
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -2733,7 +2733,7 @@ raid10_size(mddev_t *mddev, sector_t sectors, int raid_disks) ...@@ -2733,7 +2733,7 @@ raid10_size(mddev_t *mddev, sector_t sectors, int raid_disks)
} }
static conf_t *setup_conf(mddev_t *mddev) static conf_t *setup_conf(struct mddev *mddev)
{ {
conf_t *conf = NULL; conf_t *conf = NULL;
int nc, fc, fo; int nc, fc, fo;
...@@ -2836,7 +2836,7 @@ static conf_t *setup_conf(mddev_t *mddev) ...@@ -2836,7 +2836,7 @@ static conf_t *setup_conf(mddev_t *mddev)
return ERR_PTR(err); return ERR_PTR(err);
} }
static int run(mddev_t *mddev) static int run(struct mddev *mddev)
{ {
conf_t *conf; conf_t *conf;
int i, disk_idx, chunk_size; int i, disk_idx, chunk_size;
...@@ -2966,7 +2966,7 @@ static int run(mddev_t *mddev) ...@@ -2966,7 +2966,7 @@ static int run(mddev_t *mddev)
return -EIO; return -EIO;
} }
static int stop(mddev_t *mddev) static int stop(struct mddev *mddev)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -2983,7 +2983,7 @@ static int stop(mddev_t *mddev) ...@@ -2983,7 +2983,7 @@ static int stop(mddev_t *mddev)
return 0; return 0;
} }
static void raid10_quiesce(mddev_t *mddev, int state) static void raid10_quiesce(struct mddev *mddev, int state)
{ {
conf_t *conf = mddev->private; conf_t *conf = mddev->private;
...@@ -2997,7 +2997,7 @@ static void raid10_quiesce(mddev_t *mddev, int state) ...@@ -2997,7 +2997,7 @@ static void raid10_quiesce(mddev_t *mddev, int state)
} }
} }
static void *raid10_takeover_raid0(mddev_t *mddev) static void *raid10_takeover_raid0(struct mddev *mddev)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
conf_t *conf; conf_t *conf;
...@@ -3029,7 +3029,7 @@ static void *raid10_takeover_raid0(mddev_t *mddev) ...@@ -3029,7 +3029,7 @@ static void *raid10_takeover_raid0(mddev_t *mddev)
return conf; return conf;
} }
static void *raid10_takeover(mddev_t *mddev) static void *raid10_takeover(struct mddev *mddev)
{ {
struct raid0_private_data *raid0_priv; struct raid0_private_data *raid0_priv;
......
drivers/md/raid10.h
View file @ fd01b88c
...@@ -16,7 +16,7 @@ struct mirror_info { ...@@ -16,7 +16,7 @@ struct mirror_info {
typedef struct r10bio_s r10bio_t; typedef struct r10bio_s r10bio_t;
struct r10_private_data_s { struct r10_private_data_s {
mddev_t *mddev; struct mddev *mddev;
mirror_info_t *mirrors; mirror_info_t *mirrors;
int raid_disks; int raid_disks;
spinlock_t device_lock; spinlock_t device_lock;
...@@ -87,7 +87,7 @@ struct r10bio_s { ...@@ -87,7 +87,7 @@ struct r10bio_s {
sector_t sector; /* virtual sector number */ sector_t sector; /* virtual sector number */
int sectors; int sectors;
unsigned long state; unsigned long state;
mddev_t *mddev; struct mddev *mddev;
/* /*
* original bio going to /dev/mdx * original bio going to /dev/mdx
*/ */
......
drivers/md/raid5.c
View file @ fd01b88c
...@@ -1719,7 +1719,7 @@ static void raid5_build_block(struct stripe_head *sh, int i, int previous) ...@@ -1719,7 +1719,7 @@ static void raid5_build_block(struct stripe_head *sh, int i, int previous)
dev->sector = compute_blocknr(sh, i, previous); dev->sector = compute_blocknr(sh, i, previous);
} }
static void error(mddev_t *mddev, struct md_rdev *rdev) static void error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -3403,7 +3403,7 @@ static void activate_bit_delay(raid5_conf_t *conf) ...@@ -3403,7 +3403,7 @@ static void activate_bit_delay(raid5_conf_t *conf)
} }
} }
int md_raid5_congested(mddev_t *mddev, int bits) int md_raid5_congested(struct mddev *mddev, int bits)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -3424,7 +3424,7 @@ EXPORT_SYMBOL_GPL(md_raid5_congested); ...@@ -3424,7 +3424,7 @@ EXPORT_SYMBOL_GPL(md_raid5_congested);
static int raid5_congested(void *data, int bits) static int raid5_congested(void *data, int bits)
{ {
mddev_t *mddev = data; struct mddev *mddev = data;
return mddev_congested(mddev, bits) || return mddev_congested(mddev, bits) ||
md_raid5_congested(mddev, bits); md_raid5_congested(mddev, bits);
...@@ -3437,7 +3437,7 @@ static int raid5_mergeable_bvec(struct request_queue *q, ...@@ -3437,7 +3437,7 @@ static int raid5_mergeable_bvec(struct request_queue *q,
struct bvec_merge_data *bvm, struct bvec_merge_data *bvm,
struct bio_vec *biovec) struct bio_vec *biovec)
{ {
mddev_t *mddev = q->queuedata; struct mddev *mddev = q->queuedata;
sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
int max; int max;
unsigned int chunk_sectors = mddev->chunk_sectors; unsigned int chunk_sectors = mddev->chunk_sectors;
...@@ -3457,7 +3457,7 @@ static int raid5_mergeable_bvec(struct request_queue *q, ...@@ -3457,7 +3457,7 @@ static int raid5_mergeable_bvec(struct request_queue *q,
} }
static int in_chunk_boundary(mddev_t *mddev, struct bio *bio) static int in_chunk_boundary(struct mddev *mddev, struct bio *bio)
{ {
sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev); sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev);
unsigned int chunk_sectors = mddev->chunk_sectors; unsigned int chunk_sectors = mddev->chunk_sectors;
...@@ -3520,7 +3520,7 @@ static struct bio *remove_bio_from_retry(raid5_conf_t *conf) ...@@ -3520,7 +3520,7 @@ static struct bio *remove_bio_from_retry(raid5_conf_t *conf)
static void raid5_align_endio(struct bio *bi, int error) static void raid5_align_endio(struct bio *bi, int error)
{ {
struct bio* raid_bi = bi->bi_private; struct bio* raid_bi = bi->bi_private;
mddev_t *mddev; struct mddev *mddev;
raid5_conf_t *conf; raid5_conf_t *conf;
int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags); int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -3567,7 +3567,7 @@ static int bio_fits_rdev(struct bio *bi) ...@@ -3567,7 +3567,7 @@ static int bio_fits_rdev(struct bio *bi)
} }
static int chunk_aligned_read(mddev_t *mddev, struct bio * raid_bio) static int chunk_aligned_read(struct mddev *mddev, struct bio * raid_bio)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int dd_idx; int dd_idx;
...@@ -3688,7 +3688,7 @@ static struct stripe_head *__get_priority_stripe(raid5_conf_t *conf) ...@@ -3688,7 +3688,7 @@ static struct stripe_head *__get_priority_stripe(raid5_conf_t *conf)
return sh; return sh;
} }
static int make_request(mddev_t *mddev, struct bio * bi) static int make_request(struct mddev *mddev, struct bio * bi)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int dd_idx; int dd_idx;
...@@ -3848,9 +3848,9 @@ static int make_request(mddev_t *mddev, struct bio * bi) ...@@ -3848,9 +3848,9 @@ static int make_request(mddev_t *mddev, struct bio * bi)
return 0; return 0;
} }
static sector_t raid5_size(mddev_t *mddev, sector_t sectors, int raid_disks); static sector_t raid5_size(struct mddev *mddev, sector_t sectors, int raid_disks);
static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped) static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *skipped)
{ {
/* reshaping is quite different to recovery/resync so it is /* reshaping is quite different to recovery/resync so it is
* handled quite separately ... here. * handled quite separately ... here.
...@@ -4068,7 +4068,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped ...@@ -4068,7 +4068,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
} }
/* FIXME go_faster isn't used */ /* FIXME go_faster isn't used */
static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster) static inline sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
struct stripe_head *sh; struct stripe_head *sh;
...@@ -4227,7 +4227,7 @@ static int retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio) ...@@ -4227,7 +4227,7 @@ static int retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio)
* During the scan, completed stripes are saved for us by the interrupt * During the scan, completed stripes are saved for us by the interrupt
* handler, so that they will not have to wait for our next wakeup. * handler, so that they will not have to wait for our next wakeup.
*/ */
static void raid5d(mddev_t *mddev) static void raid5d(struct mddev *mddev)
{ {
struct stripe_head *sh; struct stripe_head *sh;
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -4294,7 +4294,7 @@ static void raid5d(mddev_t *mddev) ...@@ -4294,7 +4294,7 @@ static void raid5d(mddev_t *mddev)
} }
static ssize_t static ssize_t
raid5_show_stripe_cache_size(mddev_t *mddev, char *page) raid5_show_stripe_cache_size(struct mddev *mddev, char *page)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
if (conf) if (conf)
...@@ -4304,7 +4304,7 @@ raid5_show_stripe_cache_size(mddev_t *mddev, char *page) ...@@ -4304,7 +4304,7 @@ raid5_show_stripe_cache_size(mddev_t *mddev, char *page)
} }
int int
raid5_set_cache_size(mddev_t *mddev, int size) raid5_set_cache_size(struct mddev *mddev, int size)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int err; int err;
...@@ -4330,7 +4330,7 @@ raid5_set_cache_size(mddev_t *mddev, int size) ...@@ -4330,7 +4330,7 @@ raid5_set_cache_size(mddev_t *mddev, int size)
EXPORT_SYMBOL(raid5_set_cache_size); EXPORT_SYMBOL(raid5_set_cache_size);
static ssize_t static ssize_t
raid5_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len) raid5_store_stripe_cache_size(struct mddev *mddev, const char *page, size_t len)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
unsigned long new; unsigned long new;
...@@ -4355,7 +4355,7 @@ raid5_stripecache_size = __ATTR(stripe_cache_size, S_IRUGO | S_IWUSR, ...@@ -4355,7 +4355,7 @@ raid5_stripecache_size = __ATTR(stripe_cache_size, S_IRUGO | S_IWUSR,
raid5_store_stripe_cache_size); raid5_store_stripe_cache_size);
static ssize_t static ssize_t
raid5_show_preread_threshold(mddev_t *mddev, char *page) raid5_show_preread_threshold(struct mddev *mddev, char *page)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
if (conf) if (conf)
...@@ -4365,7 +4365,7 @@ raid5_show_preread_threshold(mddev_t *mddev, char *page) ...@@ -4365,7 +4365,7 @@ raid5_show_preread_threshold(mddev_t *mddev, char *page)
} }
static ssize_t static ssize_t
raid5_store_preread_threshold(mddev_t *mddev, const char *page, size_t len) raid5_store_preread_threshold(struct mddev *mddev, const char *page, size_t len)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
unsigned long new; unsigned long new;
...@@ -4389,7 +4389,7 @@ raid5_preread_bypass_threshold = __ATTR(preread_bypass_threshold, ...@@ -4389,7 +4389,7 @@ raid5_preread_bypass_threshold = __ATTR(preread_bypass_threshold,
raid5_store_preread_threshold); raid5_store_preread_threshold);
static ssize_t static ssize_t
stripe_cache_active_show(mddev_t *mddev, char *page) stripe_cache_active_show(struct mddev *mddev, char *page)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
if (conf) if (conf)
...@@ -4413,7 +4413,7 @@ static struct attribute_group raid5_attrs_group = { ...@@ -4413,7 +4413,7 @@ static struct attribute_group raid5_attrs_group = {
}; };
static sector_t static sector_t
raid5_size(mddev_t *mddev, sector_t sectors, int raid_disks) raid5_size(struct mddev *mddev, sector_t sectors, int raid_disks)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -4540,7 +4540,7 @@ static int raid5_alloc_percpu(raid5_conf_t *conf) ...@@ -4540,7 +4540,7 @@ static int raid5_alloc_percpu(raid5_conf_t *conf)
return err; return err;
} }
static raid5_conf_t *setup_conf(mddev_t *mddev) static raid5_conf_t *setup_conf(struct mddev *mddev)
{ {
raid5_conf_t *conf; raid5_conf_t *conf;
int raid_disk, memory, max_disks; int raid_disk, memory, max_disks;
...@@ -4705,7 +4705,7 @@ static int only_parity(int raid_disk, int algo, int raid_disks, int max_degraded ...@@ -4705,7 +4705,7 @@ static int only_parity(int raid_disk, int algo, int raid_disks, int max_degraded
return 0; return 0;
} }
static int run(mddev_t *mddev) static int run(struct mddev *mddev)
{ {
raid5_conf_t *conf; raid5_conf_t *conf;
int working_disks = 0; int working_disks = 0;
...@@ -4942,7 +4942,7 @@ static int run(mddev_t *mddev) ...@@ -4942,7 +4942,7 @@ static int run(mddev_t *mddev)
return -EIO; return -EIO;
} }
static int stop(mddev_t *mddev) static int stop(struct mddev *mddev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -4955,7 +4955,7 @@ static int stop(mddev_t *mddev) ...@@ -4955,7 +4955,7 @@ static int stop(mddev_t *mddev)
return 0; return 0;
} }
static void status(struct seq_file *seq, mddev_t *mddev) static void status(struct seq_file *seq, struct mddev *mddev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int i; int i;
...@@ -4994,7 +4994,7 @@ static void print_raid5_conf (raid5_conf_t *conf) ...@@ -4994,7 +4994,7 @@ static void print_raid5_conf (raid5_conf_t *conf)
} }
} }
static int raid5_spare_active(mddev_t *mddev) static int raid5_spare_active(struct mddev *mddev)
{ {
int i; int i;
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -5019,7 +5019,7 @@ static int raid5_spare_active(mddev_t *mddev) ...@@ -5019,7 +5019,7 @@ static int raid5_spare_active(mddev_t *mddev)
return count; return count;
} }
static int raid5_remove_disk(mddev_t *mddev, int number) static int raid5_remove_disk(struct mddev *mddev, int number)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int err = 0; int err = 0;
...@@ -5062,7 +5062,7 @@ static int raid5_remove_disk(mddev_t *mddev, int number) ...@@ -5062,7 +5062,7 @@ static int raid5_remove_disk(mddev_t *mddev, int number)
return err; return err;
} }
static int raid5_add_disk(mddev_t *mddev, struct md_rdev *rdev) static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
int err = -EEXIST; int err = -EEXIST;
...@@ -5105,7 +5105,7 @@ static int raid5_add_disk(mddev_t *mddev, struct md_rdev *rdev) ...@@ -5105,7 +5105,7 @@ static int raid5_add_disk(mddev_t *mddev, struct md_rdev *rdev)
return err; return err;
} }
static int raid5_resize(mddev_t *mddev, sector_t sectors) static int raid5_resize(struct mddev *mddev, sector_t sectors)
{ {
/* no resync is happening, and there is enough space /* no resync is happening, and there is enough space
* on all devices, so we can resize. * on all devices, so we can resize.
...@@ -5132,7 +5132,7 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors) ...@@ -5132,7 +5132,7 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)
return 0; return 0;
} }
static int check_stripe_cache(mddev_t *mddev) static int check_stripe_cache(struct mddev *mddev)
{ {
/* Can only proceed if there are plenty of stripe_heads. /* Can only proceed if there are plenty of stripe_heads.
* We need a minimum of one full stripe,, and for sensible progress * We need a minimum of one full stripe,, and for sensible progress
...@@ -5156,7 +5156,7 @@ static int check_stripe_cache(mddev_t *mddev) ...@@ -5156,7 +5156,7 @@ static int check_stripe_cache(mddev_t *mddev)
return 1; return 1;
} }
static int check_reshape(mddev_t *mddev) static int check_reshape(struct mddev *mddev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -5188,7 +5188,7 @@ static int check_reshape(mddev_t *mddev) ...@@ -5188,7 +5188,7 @@ static int check_reshape(mddev_t *mddev)
return resize_stripes(conf, conf->raid_disks + mddev->delta_disks); return resize_stripes(conf, conf->raid_disks + mddev->delta_disks);
} }
static int raid5_start_reshape(mddev_t *mddev) static int raid5_start_reshape(struct mddev *mddev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
struct md_rdev *rdev; struct md_rdev *rdev;
...@@ -5332,7 +5332,7 @@ static void end_reshape(raid5_conf_t *conf) ...@@ -5332,7 +5332,7 @@ static void end_reshape(raid5_conf_t *conf)
/* This is called from the raid5d thread with mddev_lock held. /* This is called from the raid5d thread with mddev_lock held.
* It makes config changes to the device. * It makes config changes to the device.
*/ */
static void raid5_finish_reshape(mddev_t *mddev) static void raid5_finish_reshape(struct mddev *mddev)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -5367,7 +5367,7 @@ static void raid5_finish_reshape(mddev_t *mddev) ...@@ -5367,7 +5367,7 @@ static void raid5_finish_reshape(mddev_t *mddev)
} }
} }
static void raid5_quiesce(mddev_t *mddev, int state) static void raid5_quiesce(struct mddev *mddev, int state)
{ {
raid5_conf_t *conf = mddev->private; raid5_conf_t *conf = mddev->private;
...@@ -5403,7 +5403,7 @@ static void raid5_quiesce(mddev_t *mddev, int state) ...@@ -5403,7 +5403,7 @@ static void raid5_quiesce(mddev_t *mddev, int state)
} }
static void *raid45_takeover_raid0(mddev_t *mddev, int level) static void *raid45_takeover_raid0(struct mddev *mddev, int level)
{ {
struct raid0_private_data *raid0_priv = mddev->private; struct raid0_private_data *raid0_priv = mddev->private;
sector_t sectors; sector_t sectors;
...@@ -5430,7 +5430,7 @@ static void *raid45_takeover_raid0(mddev_t *mddev, int level) ...@@ -5430,7 +5430,7 @@ static void *raid45_takeover_raid0(mddev_t *mddev, int level)
} }
static void *raid5_takeover_raid1(mddev_t *mddev) static void *raid5_takeover_raid1(struct mddev *mddev)
{ {
int chunksect; int chunksect;
...@@ -5457,7 +5457,7 @@ static void *raid5_takeover_raid1(mddev_t *mddev) ...@@ -5457,7 +5457,7 @@ static void *raid5_takeover_raid1(mddev_t *mddev)
return setup_conf(mddev); return setup_conf(mddev);
} }
static void *raid5_takeover_raid6(mddev_t *mddev) static void *raid5_takeover_raid6(struct mddev *mddev)
{ {
int new_layout; int new_layout;
...@@ -5491,7 +5491,7 @@ static void *raid5_takeover_raid6(mddev_t *mddev) ...@@ -5491,7 +5491,7 @@ static void *raid5_takeover_raid6(mddev_t *mddev)
} }
static int raid5_check_reshape(mddev_t *mddev) static int raid5_check_reshape(struct mddev *mddev)
{ {
/* For a 2-drive array, the layout and chunk size can be changed /* For a 2-drive array, the layout and chunk size can be changed
* immediately as not restriping is needed. * immediately as not restriping is needed.
...@@ -5531,7 +5531,7 @@ static int raid5_check_reshape(mddev_t *mddev) ...@@ -5531,7 +5531,7 @@ static int raid5_check_reshape(mddev_t *mddev)
return check_reshape(mddev); return check_reshape(mddev);
} }
static int raid6_check_reshape(mddev_t *mddev) static int raid6_check_reshape(struct mddev *mddev)
{ {
int new_chunk = mddev->new_chunk_sectors; int new_chunk = mddev->new_chunk_sectors;
...@@ -5551,7 +5551,7 @@ static int raid6_check_reshape(mddev_t *mddev) ...@@ -5551,7 +5551,7 @@ static int raid6_check_reshape(mddev_t *mddev)
return check_reshape(mddev); return check_reshape(mddev);
} }
static void *raid5_takeover(mddev_t *mddev) static void *raid5_takeover(struct mddev *mddev)
{ {
/* raid5 can take over: /* raid5 can take over:
* raid0 - if there is only one strip zone - make it a raid4 layout * raid0 - if there is only one strip zone - make it a raid4 layout
...@@ -5574,7 +5574,7 @@ static void *raid5_takeover(mddev_t *mddev) ...@@ -5574,7 +5574,7 @@ static void *raid5_takeover(mddev_t *mddev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static void *raid4_takeover(mddev_t *mddev) static void *raid4_takeover(struct mddev *mddev)
{ {
/* raid4 can take over: /* raid4 can take over:
* raid0 - if there is only one strip zone * raid0 - if there is only one strip zone
...@@ -5593,7 +5593,7 @@ static void *raid4_takeover(mddev_t *mddev) ...@@ -5593,7 +5593,7 @@ static void *raid4_takeover(mddev_t *mddev)
static struct mdk_personality raid5_personality; static struct mdk_personality raid5_personality;
static void *raid6_takeover(mddev_t *mddev) static void *raid6_takeover(struct mddev *mddev)
{ {
/* Currently can only take over a raid5. We map the /* Currently can only take over a raid5. We map the
* personality to an equivalent raid6 personality * personality to an equivalent raid6 personality
......
drivers/md/raid5.h
View file @ fd01b88c
...@@ -349,7 +349,7 @@ struct disk_info { ...@@ -349,7 +349,7 @@ struct disk_info {
struct raid5_private_data { struct raid5_private_data {
struct hlist_head *stripe_hashtbl; struct hlist_head *stripe_hashtbl;
mddev_t *mddev; struct mddev *mddev;
struct disk_info *spare; struct disk_info *spare;
int chunk_sectors; int chunk_sectors;
int level, algorithm; int level, algorithm;
...@@ -503,7 +503,7 @@ static inline int algorithm_is_DDF(int layout) ...@@ -503,7 +503,7 @@ static inline int algorithm_is_DDF(int layout)
return layout >= 8 && layout <= 10; return layout >= 8 && layout <= 10;
} }
extern int md_raid5_congested(mddev_t *mddev, int bits); extern int md_raid5_congested(struct mddev *mddev, int bits);
extern void md_raid5_kick_device(raid5_conf_t *conf); extern void md_raid5_kick_device(raid5_conf_t *conf);
extern int raid5_set_cache_size(mddev_t *mddev, int size); extern int raid5_set_cache_size(struct mddev *mddev, int size);
#endif #endif
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7