diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:18:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:18:46 +1100 |
commit | d707953c5a68f4e4deea9cf72ac815f6836270cd (patch) | |
tree | 640e68b10511f7fdfb128471a719a977a61c2d62 /drivers/md | |
parent | 6490325d3a3e7c7ad6ccd94e940f0a798412dea2 (diff) | |
parent | c656ae95d1c5c8ed5763356263ace2d03087efec (diff) |
Merge remote branch 'sysctl/master'
Conflicts:
net/ipv6/addrconf.c
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/md.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 1ee76bf243fd..b4860255cf2a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -104,44 +104,40 @@ static struct ctl_table_header *raid_table_header; static ctl_table raid_table[] = { { - .ctl_name = DEV_RAID_SPEED_LIMIT_MIN, .procname = "speed_limit_min", .data = &sysctl_speed_limit_min, .maxlen = sizeof(int), .mode = S_IRUGO|S_IWUSR, - .proc_handler = &proc_dointvec, + .proc_handler = proc_dointvec, }, { - .ctl_name = DEV_RAID_SPEED_LIMIT_MAX, .procname = "speed_limit_max", .data = &sysctl_speed_limit_max, .maxlen = sizeof(int), .mode = S_IRUGO|S_IWUSR, - .proc_handler = &proc_dointvec, + .proc_handler = proc_dointvec, }, - { .ctl_name = 0 } + { } }; static ctl_table raid_dir_table[] = { { - .ctl_name = DEV_RAID, .procname = "raid", .maxlen = 0, .mode = S_IRUGO|S_IXUGO, .child = raid_table, }, - { .ctl_name = 0 } + { } }; static ctl_table raid_root_table[] = { { - .ctl_name = CTL_DEV, .procname = "dev", .maxlen = 0, .mode = 0555, .child = raid_dir_table, }, - { .ctl_name = 0 } + { } }; static const struct block_device_operations md_fops; |