[PATCH 5/6] UBI: Fastmap: Fix fastmap usage in ubi_volume_notify()

[Tanya Brokhman]

On 11/30/2014 1:35 PM, Richard Weinberger wrote:
> There is no need to switch to ro mode if ubi_update_fastmap() fails.
> Also get rid of the ifdef.
>
> Signed-off-by: Richard Weinberger <richard at nod.at>

Reviewed-by: Tanya Brokhman <tlinder at codeaurora.org>

> ---
>   drivers/mtd/ubi/build.c | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
> index 3405be4..3152331 100644
> --- a/drivers/mtd/ubi/build.c
> +++ b/drivers/mtd/ubi/build.c
> @@ -154,23 +154,22 @@ static struct device_attribute dev_mtd_num =
>    */
>   int ubi_volume_notify(struct ubi_device *ubi, struct ubi_volume *vol, int ntype)
>   {
> +	int ret;
>   	struct ubi_notification nt;
>
>   	ubi_do_get_device_info(ubi, &nt.di);
>   	ubi_do_get_volume_info(ubi, vol, &nt.vi);
>
> -#ifdef CONFIG_MTD_UBI_FASTMAP
>   	switch (ntype) {
>   	case UBI_VOLUME_ADDED:
>   	case UBI_VOLUME_REMOVED:
>   	case UBI_VOLUME_RESIZED:
>   	case UBI_VOLUME_RENAMED:
> -		if (ubi_update_fastmap(ubi)) {
> -			ubi_err(ubi, "Unable to update fastmap!");
> -			ubi_ro_mode(ubi);
> -		}
> +		ret = ubi_update_fastmap(ubi);
> +		if (ret)
> +			ubi_msg(ubi, "Unable to write a new fastmap: %i", ret);
>   	}
> -#endif
> +
>   	return blocking_notifier_call_chain(&ubi_notifiers, ntype, &nt);
>   }
>
>


Thanks,
Tanya Brokhman
-- 
Qualcomm Israel, on behalf of Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project