lkml.org 
[lkml]   [2007]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 2.6.20] drivers/md.c: Use ARRAY_SIZE macro when appropriate
    From
    Hi all,

    A patch to use ARRAY_SIZE macro already defined in kernel.h

    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    ---
    diff --git a/drivers/md/md.c b/drivers/md/md.c
    index e8807ea..6f6d9e5 100644
    --- a/drivers/md/md.c
    +++ b/drivers/md/md.c
    @@ -33,6 +33,7 @@
    */

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

    --
    Ahmed S. Darwish
    http://darwish-07.blogspot.com
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-06 17:11    [W:0.021 / U:60.572 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site