OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/md.c: Use ARRAY_SIZE macro when appropriate 

Use ARRAY_SIZE macro already defined in kernel.h

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ahmed S. Darwish 2007-05-09 02:35:34 -07:00 committed by Linus Torvalds
parent bc0ca06e24
commit 50511da3da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/md.c
View File

@ -33,6 +33,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/raid/md.h> #include <linux/raid/md.h>
@ -2637,8 +2638,7 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)
minor = simple_strtoul(buf, &e, 10); minor = simple_strtoul(buf, &e, 10);
if (e==buf || (*e && *e != '\n') ) if (e==buf || (*e && *e != '\n') )
return -EINVAL; return -EINVAL;
if (major >= sizeof(super_types)/sizeof(super_types[0]) || if (major >= ARRAY_SIZE(super_types) || super_types[major].name == NULL)
super_types[major].name == NULL)
return -ENOENT; return -ENOENT;
mddev->major_version = major; mddev->major_version = major;
mddev->minor_version = minor; mddev->minor_version = minor;
@ -4019,7 +4019,7 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
if (info->raid_disks == 0) { if (info->raid_disks == 0) {
/* just setting version number for superblock loading */ /* just setting version number for superblock loading */
if (info->major_version < 0 || if (info->major_version < 0 ||
info->major_version >= sizeof(super_types)/sizeof(super_types[0]) || info->major_version >= ARRAY_SIZE(super_types) ||
super_types[info->major_version].name == NULL) { super_types[info->major_version].name == NULL) {
/* maybe try to auto-load a module? */ /* maybe try to auto-load a module? */
printk(KERN_INFO printk(KERN_INFO