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 55
55
#define MaxFault 50
56
56
#include <linux/blkdev.h>
57
57
#include <linux/module.h>
58
- #include <linux/raid/md_u.h>
59
58
#include <linux/slab.h>
60
59
#include "md.h"
61
60
#include <linux/seq_file.h>
@@ -350,9 +349,13 @@ static void faulty_free(struct mddev *mddev, void *priv)
350
349
351
350
static struct md_personality faulty_personality =
352
351
{
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
+
356
359
.make_request = faulty_make_request ,
357
360
.run = faulty_run ,
358
361
.free = faulty_free ,
@@ -363,12 +366,12 @@ static struct md_personality faulty_personality =
363
366
364
367
static int __init raid_init (void )
365
368
{
366
- return register_md_personality (& faulty_personality );
369
+ return register_md_submodule (& faulty_personality . head );
367
370
}
368
371
369
372
static void raid_exit (void )
370
373
{
371
- unregister_md_personality (& faulty_personality );
374
+ unregister_md_submodule (& faulty_personality . head );
372
375
}
373
376
374
377
module_init (raid_init );
Original file line number Diff line number Diff line change 13
13
14
14
#include <linux/blkdev.h>
15
15
#include <linux/module.h>
16
- #include <linux/raid/md_u.h>
17
16
#include <linux/seq_file.h>
18
17
#include <linux/slab.h>
19
18
#include "md.h"
@@ -430,9 +429,12 @@ static void multipath_free(struct mddev *mddev, void *priv)
430
429
431
430
static struct md_personality multipath_personality =
432
431
{
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
+ },
436
438
.make_request = multipath_make_request ,
437
439
.run = multipath_run ,
438
440
.free = multipath_free ,
@@ -445,12 +447,12 @@ static struct md_personality multipath_personality =
445
447
446
448
static int __init multipath_init (void )
447
449
{
448
- return register_md_personality (& multipath_personality );
450
+ return register_md_submodule (& multipath_personality . head );
449
451
}
450
452
451
453
static void __exit multipath_exit (void )
452
454
{
453
- unregister_md_personality (& multipath_personality );
455
+ unregister_md_submodule (& multipath_personality . head );
454
456
}
455
457
456
458
module_init (multipath_init );
Original file line number Diff line number Diff line change @@ -31,6 +31,8 @@ enum md_submodule_type {
31
31
32
32
enum md_submodule_id {
33
33
ID_LINEAR = LEVEL_LINEAR ,
34
+ ID_FAULTY = LEVEL_FAULTY ,
35
+ ID_MULTIPATH = LEVEL_MULTIPATH ,
34
36
ID_RAID0 = 0 ,
35
37
ID_RAID1 = 1 ,
36
38
ID_RAID4 = 4 ,
You can’t perform that action at this time.
0 commit comments