|
@@ -798,18 +798,18 @@ static int rename_volumes(struct ubi_device *ubi,
|
|
goto out_free;
|
|
goto out_free;
|
|
}
|
|
}
|
|
|
|
|
|
- re = kzalloc(sizeof(struct ubi_rename_entry), GFP_KERNEL);
|
|
|
|
- if (!re) {
|
|
|
|
|
|
+ re1 = kzalloc(sizeof(struct ubi_rename_entry), GFP_KERNEL);
|
|
|
|
+ if (!re1) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
ubi_close_volume(desc);
|
|
ubi_close_volume(desc);
|
|
goto out_free;
|
|
goto out_free;
|
|
}
|
|
}
|
|
|
|
|
|
- re->remove = 1;
|
|
|
|
- re->desc = desc;
|
|
|
|
- list_add(&re->list, &rename_list);
|
|
|
|
|
|
+ re1->remove = 1;
|
|
|
|
+ re1->desc = desc;
|
|
|
|
+ list_add(&re1->list, &rename_list);
|
|
dbg_msg("will remove volume %d, name \"%s\"",
|
|
dbg_msg("will remove volume %d, name \"%s\"",
|
|
- re->desc->vol->vol_id, re->desc->vol->name);
|
|
|
|
|
|
+ re1->desc->vol->vol_id, re1->desc->vol->name);
|
|
}
|
|
}
|
|
|
|
|
|
mutex_lock(&ubi->device_mutex);
|
|
mutex_lock(&ubi->device_mutex);
|