[PATCH] MD - Convert struct initialised in md to "the new way"

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index f85bf19ce7a7acc07fa2d0643c54d545d20b7625..145d1416198de3fc96eeb4b5cca3e0aa1549bc3d 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -193,11 +193,11 @@ static int linear_status (char *page, mddev_t *mddev)
 
 static mdk_personality_t linear_personality=
 {
-       name:           "linear",
-       make_request:   linear_make_request,
-       run:            linear_run,
-       stop:           linear_stop,
-       status:         linear_status,
+       .name           = "linear",
+       .make_request   = linear_make_request,
+       .run            = linear_run,
+       .stop           = linear_stop,
+       .status         = linear_status,
 };
 
 static int __init linear_init (void)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index a8e1281364eb52270c50f0bef2d5341b647adcf4..cfe3bef819e33ee3c5294018a1c6663b87e420b2 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -118,14 +118,14 @@ static devfs_handle_t devfs_handle;
 
 static struct gendisk md_gendisk=
 {
-       major: MD_MAJOR,
-       major_name: "md",
-       minor_shift: 0,
-       part: md_hd_struct,
-       sizes: md_size,
-       nr_real: MAX_MD_DEVS,
-       next: NULL,
-       fops: &md_fops,
+       .major          = MD_MAJOR,
+       .major_name     = "md",
+       .minor_shift    = 0,
+       .part           = md_hd_struct,
+       .sizes          = md_size,
+       .nr_real        = MAX_MD_DEVS,
+       .next           = NULL,
+       .fops           = &md_fops,
 };
 
 /*
@@ -2474,10 +2474,10 @@ static int md_release(struct inode *inode, struct file * file)
 
 static struct block_device_operations md_fops =
 {
-       owner:          THIS_MODULE,
-       open:           md_open,
-       release:        md_release,
-       ioctl:          md_ioctl,
+       .owner          = THIS_MODULE,
+       .open           = md_open,
+       .release        = md_release,
+       .ioctl          = md_ioctl,
 };
 
 
@@ -3165,9 +3165,9 @@ int md_notify_reboot(struct notifier_block *this,
 }
 
 struct notifier_block md_notifier = {
-       notifier_call:  md_notify_reboot,
-       next:           NULL,
-       priority:       INT_MAX, /* before any real devices */
+       .notifier_call  = md_notify_reboot,
+       .next           = NULL,
+       .priority       = INT_MAX, /* before any real devices */
 };
 
 static void md_geninit(void)

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 13c1201dd6c07a0a3fe619470effeae267456b4d..62fe2cc742f0b7a1398579657b646fe08cae100e 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -562,14 +562,14 @@ static int multipath_stop (mddev_t *mddev)
 
 static mdk_personality_t multipath_personality=
 {
-       name:           "multipath",
-       make_request:   multipath_make_request,
-       run:            multipath_run,
-       stop:           multipath_stop,
-       status:         multipath_status,
-       error_handler:  multipath_error,
-       hot_add_disk:   multipath_add_disk,
-       hot_remove_disk:multipath_remove_disk,
+       .name           = "multipath",
+       .make_request   = multipath_make_request,
+       .run            = multipath_run,
+       .stop           = multipath_stop,
+       .status         = multipath_status,
+       .error_handler  = multipath_error,
+       .hot_add_disk   = multipath_add_disk,
+       .hot_remove_disk= multipath_remove_disk,
 };
 
 static int __init multipath_init (void)

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 29d72b65560669b2cff9936e09fa77ba8e69661c..75ce1686dd7cc6ddd8c3b86aa00f682e92165c88 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -366,11 +366,11 @@ static int raid0_status (char *page, mddev_t *mddev)
 
 static mdk_personality_t raid0_personality=
 {
-       name:           "raid0",
-       make_request:   raid0_make_request,
-       run:            raid0_run,
-       stop:           raid0_stop,
-       status:         raid0_status,
+       .name           = "raid0",
+       .make_request   = raid0_make_request,
+       .run            = raid0_run,
+       .stop           = raid0_stop,
+       .status         = raid0_status,
 };
 
 static int __init raid0_init (void)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d0400b4e6bd6e9e16c06fc3311424c9b8f561cb3..e18371e278b4bf7d49a75f5026d48f1cb100fa1a 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1346,18 +1346,18 @@ static int stop(mddev_t *mddev)
 
 static mdk_personality_t raid1_personality =
 {
-       name:           "raid1",
-       make_request:   make_request,
-       run:            run,
-       stop:           stop,
-       status:         status,
-       error_handler:  error,
-       hot_add_disk:   raid1_add_disk,
-       hot_remove_disk:raid1_remove_disk,
-       spare_write:    raid1_spare_write,
-       spare_inactive: raid1_spare_inactive,
-       spare_active:   raid1_spare_active,
-       sync_request:   sync_request
+       .name           = "raid1",
+       .make_request   = make_request,
+       .run            = run,
+       .stop           = stop,
+       .status         = status,
+       .error_handler  = error,
+       .hot_add_disk   = raid1_add_disk,
+       .hot_remove_disk= raid1_remove_disk,
+       .spare_write    = raid1_spare_write,
+       .spare_inactive = raid1_spare_inactive,
+       .spare_active   = raid1_spare_active,
+       .sync_request   = sync_request,
 };
 
 static int __init raid_init(void)

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e318afa3f34da4cb3af2821ce02979f232f7b696..6ee7a2df23a1d3868abfea0908c6737b836379db 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1820,18 +1820,18 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
 
 static mdk_personality_t raid5_personality=
 {
-       name:           "raid5",
-       make_request:   make_request,
-       run:            run,
-       stop:           stop,
-       status:         status,
-       error_handler:  error,
-       hot_add_disk:   raid5_add_disk,
-       hot_remove_disk:raid5_remove_disk,
-       spare_write:    raid5_spare_write,
-       spare_inactive: raid5_spare_inactive,
-       spare_active:   raid5_spare_active,
-       sync_request:   sync_request
+       .name           = "raid5",
+       .make_request   = make_request,
+       .run            = run,
+       .stop           = stop,
+       .status         = status,
+       .error_handler  = error,
+       .hot_add_disk   = raid5_add_disk,
+       .hot_remove_disk= raid5_remove_disk,
+       .spare_write    = raid5_spare_write,
+       .spare_inactive = raid5_spare_inactive,
+       .spare_active   = raid5_spare_active,
+       .sync_request   = sync_request,
 };
 
 static int __init raid5_init (void)