Skip to content

Commit

Permalink
UBI: block: Make ubiblock_resize return something
Browse files Browse the repository at this point in the history
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: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Ezequiel Garcia authored and Artem Bityutskiy committed Jul 28, 2014
1 parent 545f7fd commit 495f2bf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/mtd/ubi/block.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ int ubiblock_remove(struct ubi_volume_info *vi)
return 0;
}

static void ubiblock_resize(struct ubi_volume_info *vi)
static int ubiblock_resize(struct ubi_volume_info *vi)
{
struct ubiblock *dev;
int disk_capacity;
Expand All @@ -512,7 +512,7 @@ static void ubiblock_resize(struct ubi_volume_info *vi)
dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
if (!dev) {
mutex_unlock(&devices_mutex);
return;
return -ENODEV;
}

mutex_lock(&dev->dev_mutex);
Expand All @@ -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);
mutex_unlock(&dev->dev_mutex);
mutex_unlock(&devices_mutex);
return 0;
}

static int ubiblock_notify(struct notifier_block *nb,
Expand Down

0 comments on commit 495f2bf

Please sign in to comment.