A couple of places we all INIT_LIST_HEAD on a locally declared
variable. This can be changed to a LIST_HEAD declaration.
Signed-off-by: Neil Brown <neilb@xxxxxxx>
### Diffstat output
./drivers/md/md.c | 2 +-
./drivers/md/raid5.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff ./drivers/md/md.c~current~ ./drivers/md/md.c
--- ./drivers/md/md.c~current~ 2006-03-17 18:17:56.000000000 +1100
+++ ./drivers/md/md.c 2006-03-17 18:18:19.000000000 +1100
@@ -2895,7 +2895,6 @@ static void autorun_array(mddev_t *mddev
*/
static void autorun_devices(int part)
{
- struct list_head candidates;
struct list_head *tmp;
mdk_rdev_t *rdev0, *rdev;
mddev_t *mddev;
@@ -2904,6 +2903,7 @@ static void autorun_devices(int part)
printk(KERN_INFO "md: autorun ...\n");
while (!list_empty(&pending_raid_disks)) {
dev_t dev;
+ LIST_HEAD(candidates);
rdev0 = list_entry(pending_raid_disks.next,
mdk_rdev_t, same_set);
diff ./drivers/md/raid5.c~current~ ./drivers/md/raid5.c
--- ./drivers/md/raid5.c~current~ 2006-03-17 18:17:57.000000000 +1100
+++ ./drivers/md/raid5.c 2006-03-17 18:18:19.000000000 +1100
@@ -345,7 +345,8 @@ static int resize_stripes(raid5_conf_t *
* at some points in this operation.
*/
struct stripe_head *osh, *nsh;
- struct list_head newstripes, oldstripes;
+ LIST_HEAD(newstripes);
+ LIST_HEAD(oldstripes);
struct disk_info *ndisks;
int err = 0;
kmem_cache_t *sc;
@@ -359,7 +360,7 @@ static int resize_stripes(raid5_conf_t *
0, 0, NULL, NULL);
if (!sc)
return -ENOMEM;
- INIT_LIST_HEAD(&newstripes);
+
for (i = conf->max_nr_stripes; i; i--) {
nsh = kmem_cache_alloc(sc, GFP_NOIO);
if (!nsh)
@@ -385,7 +386,6 @@ static int resize_stripes(raid5_conf_t *
/* OK, we have enough stripes, start collecting inactive
* stripes and copying them over
*/
- INIT_LIST_HEAD(&oldstripes);
list_for_each_entry(nsh, &newstripes, lru) {
spin_lock_irq(&conf->device_lock);
wait_event_lock_irq(conf->wait_for_stripe,
-
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
