Messages in this thread Patch in this message | | | Date | Fri, 7 Jul 2000 05:37:00 -0400 (EDT) | From | Ingo Molnar <> | Subject | Re: raid5.c and -Werror |
| |
this patch collects your RAID-related patches into one patch and does something better than a cast in raid0.c. Does this compile without warnings on your Alpha?
Ingo --- linux/drivers/block/raid0.c.orig2 Fri Jul 7 02:30:54 2000 +++ linux/drivers/block/raid0.c Fri Jul 7 02:32:57 2000 @@ -120,7 +120,7 @@ static int raid0_run (mddev_t *mddev) { - int cur=0, i=0, size, zone0_size, nb_zone; + unsigned long cur=0, i=0, size, zone0_size, nb_zone; raid0_conf_t *conf; MOD_INC_USE_COUNT; @@ -142,11 +142,11 @@ printk("raid0 : conf->smallest->size is %d blocks.\n", conf->smallest->size); nb_zone = md_size[mdidx(mddev)]/conf->smallest->size + (md_size[mdidx(mddev)] % conf->smallest->size ? 1 : 0); - printk("raid0 : nb_zone is %d.\n", nb_zone); + printk("raid0 : nb_zone is %ld.\n", nb_zone); conf->nr_zones = nb_zone; - printk("raid0 : Allocating %d bytes for hash.\n", - sizeof(struct raid0_hash)*nb_zone); + printk("raid0 : Allocating %ld bytes for hash.\n", + nb_zone*sizeof(struct raid0_hash)); conf->hash_table = vmalloc (sizeof (struct raid0_hash)*nb_zone); if (!conf->hash_table) --- linux/drivers/block/raid1.c.orig2 Fri Jul 7 02:30:57 2000 +++ linux/drivers/block/raid1.c Fri Jul 7 02:34:47 2000 @@ -551,7 +551,6 @@ int disks = MD_SB_DISKS; int i, sum_bhs = 0, sectors; struct mirror_info *mirror; - DECLARE_WAITQUEUE(wait, current); if (!buffer_locked(bh)) BUG(); --- linux/drivers/block/raid5.c.orig2 Fri Jul 7 02:31:01 2000 +++ linux/drivers/block/raid5.c Fri Jul 7 02:33:51 2000 @@ -1674,7 +1674,7 @@ tmp->b_data = (char *)page_address(tmp->b_page); if (!tmp->b_data) goto out; - md_clear_page((unsigned long)tmp->b_data); + md_clear_page(tmp->b_data); memset(bh, 0, MD_SB_DISKS * sizeof(struct buffer_head *)); for (i = 0; i < conf->raid_disks; i++) { dev = conf->disks[i].dev; --- linux/drivers/block/md.c.orig2 Fri Jul 7 02:31:05 2000 +++ linux/drivers/block/md.c Fri Jul 7 02:31:15 2000 @@ -496,7 +496,7 @@ mddev->sb = (mdp_super_t *) __get_free_page (GFP_KERNEL); if (!mddev->sb) return -ENOMEM; - md_clear_page((unsigned long)mddev->sb); + md_clear_page(mddev->sb); return 0; } @@ -510,7 +510,7 @@ printk (OUT_OF_MEM); return -EINVAL; } - md_clear_page((unsigned long)rdev->sb); + md_clear_page(rdev->sb); return 0; }
| |