lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UBI: do not panic if volume check fails

Browse Source 
If a volume paranoid check fails, do not return an error
code to the caller, but just print error messages and go
forward. The primary reason for this is that it is difficult
to recover and cancel the operation at that stage.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy
2009-05-13 14:05:24 +03:00
parent cfcf0ec84b
commit d38dce5bfb
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/ubi/vmt.c
View File

@@ -358,7 +358,8 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
ubi->vol_count += 1; ubi->vol_count += 1;
spin_unlock(&ubi->volumes_lock); spin_unlock(&ubi->volumes_lock);
err = paranoid_check_volumes(ubi); if (paranoid_check_volumes(ubi))
dbg_err("check failed while creating volume %d", vol_id);
return err; return err;
out_sysfs: out_sysfs:
@@ -465,8 +466,9 @@ int ubi_remove_volume(struct ubi_volume_desc *desc, int no_vtbl)
ubi->vol_count -= 1; ubi->vol_count -= 1;
spin_unlock(&ubi->volumes_lock); spin_unlock(&ubi->volumes_lock);
if (!no_vtbl) if (!no_vtbl && paranoid_check_volumes(ubi))
err = paranoid_check_volumes(ubi); dbg_err("check failed while removing volume %d", vol_id);
return err; return err;
out_err: out_err:
@@ -587,7 +589,8 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs)
(long long)vol->used_ebs * vol->usable_leb_size; (long long)vol->used_ebs * vol->usable_leb_size;
} }
err = paranoid_check_volumes(ubi); if (paranoid_check_volumes(ubi))
dbg_err("check failed while re-sizing volume %d", vol_id);
return err; return err;
out_acc: out_acc:
@@ -635,8 +638,8 @@ int ubi_rename_volumes(struct ubi_device *ubi, struct list_head *rename_list)
} }
} }
if (!err) if (!err && paranoid_check_volumes(ubi))
err = paranoid_check_volumes(ubi); ;
return err; return err;
} }
@@ -688,7 +691,8 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol)
return err; return err;
} }
err = paranoid_check_volumes(ubi); if (paranoid_check_volumes(ubi))
dbg_err("check failed while adding volume %d", vol_id);
return err; return err;
out_gluebi: out_gluebi: