Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89838b80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs 

Pull UBI/UBIFS changes from Artem Bityutskiy:
 "No significant changes, mostly small fixes here and there.  The more
  important fixes are:

   - UBI deleted list items while iterating the list with
     'list_for_each_entry'
   - The UBI block driver did not work properly with very large UBI
     volumes"

* tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs: (21 commits)
  UBIFS: Add log overlap assertions
  Revert "UBIFS: add a log overlap assertion"
  UBI: bugfix in ubi_wl_flush()
  UBI: block: Avoid disk size integer overflow
  UBI: block: Set disk_capacity out of the mutex
  UBI: block: Make ubiblock_resize return something
  UBIFS: add a log overlap assertion
  UBIFS: remove unnecessary check
  UBIFS: remove mst_mutex
  UBIFS: kernel-doc warning fix
  UBI: init_volumes: Ignore volumes with no LEBs
  UBIFS: replace seq_printf by seq_puts
  UBIFS: replace count*size kzalloc by kcalloc
  UBIFS: kernel-doc warning fix
  UBIFS: fix error path in create_default_filesystem()
  UBIFS: fix spelling of "scanned"
  UBIFS: fix some comments
  UBIFS: remove useless @ecc in struct ubifs_scan_leb
  UBIFS: remove useless statements
  UBIFS: Add missing break statements in dbg_chk_pnode()
  ...
parents f6f99332 25601a3c

drivers/mtd/ubi/block.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -378,9 +378,11 @@ int ubiblock_create(struct ubi_volume_info *vi) 
{

{

	struct ubiblock *dev;

	struct ubiblock *dev;

	struct gendisk *gd;

	struct gendisk *gd;

	int disk_capacity;

	u64 disk_capacity = ((u64)vi->size * vi->usable_leb_size) >> 9;

	int ret;

	int ret;





	if ((sector_t)disk_capacity != disk_capacity)

		return -EFBIG;

	/* Check that the volume isn't already handled */

	/* Check that the volume isn't already handled */

	mutex_lock(&devices_mutex);

	mutex_lock(&devices_mutex);

	if (find_dev_nolock(vi->ubi_num, vi->vol_id)) {

	if (find_dev_nolock(vi->ubi_num, vi->vol_id)) {
@@ -412,7 +414,6 @@ int ubiblock_create(struct ubi_volume_info *vi) 
	gd->first_minor = dev->ubi_num * UBI_MAX_VOLUMES + dev->vol_id;

	gd->first_minor = dev->ubi_num * UBI_MAX_VOLUMES + dev->vol_id;

	gd->private_data = dev;

	gd->private_data = dev;

	sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);

	sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);

	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;

	set_capacity(gd, disk_capacity);

	set_capacity(gd, disk_capacity);

	dev->gd = gd;

	dev->gd = gd;
@@ -498,11 +499,16 @@ 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;

	u64 disk_capacity = ((u64)vi->size * vi->usable_leb_size) >> 9;





	if ((sector_t)disk_capacity != disk_capacity) {

		ubi_warn("%s: the volume is too big, cannot resize (%d LEBs)",

			 dev->gd->disk_name, vi->size);

		return -EFBIG;

	}

	/*

	/*

	 * Need to lock the device list until we stop using the device,

	 * Need to lock the device list until we stop using the device,

	 * otherwise the device struct might get released in

	 * otherwise the device struct might get released in
@@ -512,15 +518,15 @@ 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);

	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;

	set_capacity(dev->gd, disk_capacity);

	set_capacity(dev->gd, disk_capacity);

	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,

drivers/mtd/ubi/vtbl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -591,7 +591,7 @@ static int init_volumes(struct ubi_device *ubi, 




		/* Static volumes only */

		/* Static volumes only */

		av = ubi_find_av(ai, i);

		av = ubi_find_av(ai, i);

		if (!av) {

		if (!av || !av->leb_count) {

			/*

			/*

			 * No eraseblocks belonging to this volume found. We

			 * No eraseblocks belonging to this volume found. We

			 * don't actually know whether this static volume is

			 * don't actually know whether this static volume is

drivers/mtd/ubi/wl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1718,12 +1718,12 @@ int ubi_wl_flush(struct ubi_device *ubi, int vol_id, int lnum) 
	       vol_id, lnum, ubi->works_count);

	       vol_id, lnum, ubi->works_count);





	while (found) {

	while (found) {

		struct ubi_work *wrk;

		struct ubi_work *wrk, *tmp;

		found = 0;

		found = 0;





		down_read(&ubi->work_sem);

		down_read(&ubi->work_sem);

		spin_lock(&ubi->wl_lock);

		spin_lock(&ubi->wl_lock);

		list_for_each_entry(wrk, &ubi->works, list) {

		list_for_each_entry_safe(wrk, tmp, &ubi->works, list) {

			if ((vol_id == UBI_ALL || wrk->vol_id == vol_id) &&

			if ((vol_id == UBI_ALL || wrk->vol_id == vol_id) &&

			    (lnum == UBI_ALL || wrk->lnum == lnum)) {

			    (lnum == UBI_ALL || wrk->lnum == lnum)) {

				list_del(&wrk->list);

				list_del(&wrk->list);

fs/ubifs/commit.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -174,7 +174,6 @@ static int do_commit(struct ubifs_info *c) 
	if (err)

	if (err)

		goto out;

		goto out;





	mutex_lock(&c->mst_mutex);

	c->mst_node->cmt_no      = cpu_to_le64(c->cmt_no);

	c->mst_node->cmt_no      = cpu_to_le64(c->cmt_no);

	c->mst_node->log_lnum    = cpu_to_le32(new_ltail_lnum);

	c->mst_node->log_lnum    = cpu_to_le32(new_ltail_lnum);

	c->mst_node->root_lnum   = cpu_to_le32(zroot.lnum);

	c->mst_node->root_lnum   = cpu_to_le32(zroot.lnum);
@@ -204,7 +203,6 @@ static int do_commit(struct ubifs_info *c) 
	else

	else

		c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_NO_ORPHS);

		c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_NO_ORPHS);

	err = ubifs_write_master(c);

	err = ubifs_write_master(c);

	mutex_unlock(&c->mst_mutex);

	if (err)

	if (err)

		goto out;

		goto out;

fs/ubifs/io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -431,7 +431,7 @@ void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last) 




/**

/**

 * wbuf_timer_callback - write-buffer timer callback function.

 * wbuf_timer_callback - write-buffer timer callback function.

 * @data: timer data (write-buffer descriptor)

 * @timer: timer data (write-buffer descriptor)

 *

 *

 * This function is called when the write-buffer timer expires.

 * This function is called when the write-buffer timer expires.

 */

 */