Commit 495f2bf6 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Artem Bityutskiy
Browse files

UBI: block: Make ubiblock_resize return something 



Currently, ubiblock_resize() can fail if the device is not found
in the list. This commit changes the return type, so the function can
return something meaningful on error paths.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 545f7fdf

drivers/mtd/ubi/block.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -498,7 +498,7 @@ int ubiblock_remove(struct ubi_volume_info *vi) 
	return 0;

	return 0;

}

}





static void ubiblock_resize(struct ubi_volume_info *vi)

static int ubiblock_resize(struct ubi_volume_info *vi)

{

{

	struct ubiblock *dev;

	struct ubiblock *dev;

	int disk_capacity;

	int disk_capacity;
@@ -512,7 +512,7 @@ static void ubiblock_resize(struct ubi_volume_info *vi) 
	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);

	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);

	if (!dev) {

	if (!dev) {

		mutex_unlock(&devices_mutex);

		mutex_unlock(&devices_mutex);

		return;

		return -ENODEV;

	}

	}





	mutex_lock(&dev->dev_mutex);

	mutex_lock(&dev->dev_mutex);
@@ -521,6 +521,7 @@ static void ubiblock_resize(struct ubi_volume_info *vi) 
	ubi_msg("%s resized to %d LEBs", dev->gd->disk_name, vi->size);

	ubi_msg("%s resized to %d LEBs", dev->gd->disk_name, vi->size);

	mutex_unlock(&dev->dev_mutex);

	mutex_unlock(&dev->dev_mutex);

	mutex_unlock(&devices_mutex);

	mutex_unlock(&devices_mutex);

	return 0;

}

}





static int ubiblock_notify(struct notifier_block *nb,

static int ubiblock_notify(struct notifier_block *nb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE