UBI: rename ubi_scan_rm_volume
The old name is not logical anymore - rename it to 'ubi_remove_av()'. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Родитель
dcd85fdd10
Коммит
d717dc2f85
|
@ -614,11 +614,11 @@ struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
|
|||
}
|
||||
|
||||
/**
|
||||
* ubi_scan_rm_volume - delete attaching information about a volume.
|
||||
* ubi_remove_av - delete attaching information about a volume.
|
||||
* @ai: attaching information
|
||||
* @av: the volume attaching information to delete
|
||||
*/
|
||||
void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
|
||||
void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)
|
||||
{
|
||||
struct rb_node *rb;
|
||||
struct ubi_ainf_peb *aeb;
|
||||
|
|
|
@ -161,7 +161,7 @@ int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,
|
|||
int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips);
|
||||
struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
|
||||
int vol_id);
|
||||
void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);
|
||||
void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);
|
||||
struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi,
|
||||
struct ubi_attach_info *ai);
|
||||
struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);
|
||||
|
|
|
@ -738,7 +738,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
|
|||
vol = ubi->volumes[i];
|
||||
if (!vol) {
|
||||
if (av)
|
||||
ubi_scan_rm_volume(ai, av);
|
||||
ubi_remove_av(ai, av);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -756,7 +756,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
|
|||
* these eraseblocks.
|
||||
*/
|
||||
ubi_msg("finish volume %d removal", av->vol_id);
|
||||
ubi_scan_rm_volume(ai, av);
|
||||
ubi_remove_av(ai, av);
|
||||
} else if (av) {
|
||||
err = check_av(vol, av);
|
||||
if (err)
|
||||
|
|
Загрузка…
Ссылка в новой задаче