File tree Expand file tree Collapse file tree 3 files changed +19
-12
lines changed Expand file tree Collapse file tree 3 files changed +19
-12
lines changed Original file line number Diff line number Diff line change 5555#define MaxFault 50
5656#include <linux/blkdev.h>
5757#include <linux/module.h>
58- #include <linux/raid/md_u.h>
5958#include <linux/slab.h>
6059#include "md.h"
6160#include <linux/seq_file.h>
@@ -350,9 +349,13 @@ static void faulty_free(struct mddev *mddev, void *priv)
350349
351350static struct md_personality faulty_personality =
352351{
353- .name = "faulty" ,
354- .level = LEVEL_FAULTY ,
355- .owner = THIS_MODULE ,
352+ .head = {
353+ .type = MD_PERSONALITY ,
354+ .id = ID_FAULTY ,
355+ .name = "faulty" ,
356+ .owner = THIS_MODULE ,
357+ },
358+
356359 .make_request = faulty_make_request ,
357360 .run = faulty_run ,
358361 .free = faulty_free ,
@@ -363,12 +366,12 @@ static struct md_personality faulty_personality =
363366
364367static int __init raid_init (void )
365368{
366- return register_md_personality (& faulty_personality );
369+ return register_md_submodule (& faulty_personality . head );
367370}
368371
369372static void raid_exit (void )
370373{
371- unregister_md_personality (& faulty_personality );
374+ unregister_md_submodule (& faulty_personality . head );
372375}
373376
374377module_init (raid_init );
Original file line number Diff line number Diff line change 1313
1414#include <linux/blkdev.h>
1515#include <linux/module.h>
16- #include <linux/raid/md_u.h>
1716#include <linux/seq_file.h>
1817#include <linux/slab.h>
1918#include "md.h"
@@ -430,9 +429,12 @@ static void multipath_free(struct mddev *mddev, void *priv)
430429
431430static struct md_personality multipath_personality =
432431{
433- .name = "multipath" ,
434- .level = LEVEL_MULTIPATH ,
435- .owner = THIS_MODULE ,
432+ .head = {
433+ .type = MD_PERSONALITY ,
434+ .id = ID_MULTIPATH ,
435+ .name = "multipath" ,
436+ .owner = THIS_MODULE ,
437+ },
436438 .make_request = multipath_make_request ,
437439 .run = multipath_run ,
438440 .free = multipath_free ,
@@ -445,12 +447,12 @@ static struct md_personality multipath_personality =
445447
446448static int __init multipath_init (void )
447449{
448- return register_md_personality (& multipath_personality );
450+ return register_md_submodule (& multipath_personality . head );
449451}
450452
451453static void __exit multipath_exit (void )
452454{
453- unregister_md_personality (& multipath_personality );
455+ unregister_md_submodule (& multipath_personality . head );
454456}
455457
456458module_init (multipath_init );
Original file line number Diff line number Diff line change @@ -31,6 +31,8 @@ enum md_submodule_type {
3131
3232enum md_submodule_id {
3333 ID_LINEAR = LEVEL_LINEAR ,
34+ ID_FAULTY = LEVEL_FAULTY ,
35+ ID_MULTIPATH = LEVEL_MULTIPATH ,
3436 ID_RAID0 = 0 ,
3537 ID_RAID1 = 1 ,
3638 ID_RAID4 = 4 ,
You can’t perform that action at this time.
0 commit comments