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

Commit 01504f5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UBI/UBIFS updates from Richard Weinberger:

 - access time support for UBIFS by Dongsheng Yang

 - random cleanups and bug fixes all over the place

* tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs:
  ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs
  ubifs: make ubifs_[get|set]xattr atomic
  UBIFS: Delete unnecessary checks before the function call "iput"
  UBI: Remove in vain semicolon
  UBI: Fastmap: Fix PEB array type
  UBIFS: Fix possible memory leak in ubifs_readdir()
  fs/ubifs: remove unnecessary new_valid_dev check
  ubi: fastmap: Implement produce_free_peb()
  UBIFS: print verbose message when rescanning a corrupted node
  UBIFS: call dbg_is_power_cut() instead of reading c->dbg->pc_happened
  UBI: drop null test before destroy functions
  UBI: Update comments to reflect UBI_METAONLY flag
  UBI: Fix debug message
  UBI: Fix typo in comment
  UBI: Fastmap: Simplify expression
  UBIFS: fix a typo in comment of ubifs_budget_req
  UBIFS: use kmemdup rather than duplicating its implementation
parents 4bde961e 8c1c5f26

drivers/mtd/ubi/attach.c

+1 −3
Original line number Diff line number Diff line
@@ -1209,9 +1209,7 @@ static void destroy_ai(struct ubi_attach_info *ai) 
		}

	}



	if (ai->aeb_slab_cache)

	kmem_cache_destroy(ai->aeb_slab_cache);



	kfree(ai);

}

drivers/mtd/ubi/cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd, 
		if (!req) {

			err = -ENOMEM;

			break;

		};

		}



		err = copy_from_user(req, argp, sizeof(struct ubi_rnvol_req));

		if (err) {

drivers/mtd/ubi/eba.c

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap, 
					continue;



				ubi_err(ubi, "LEB:%i:%i is PEB:%i instead of %i!",

					vol->vol_id, i, fm_eba[i][j],

					vol->vol_id, j, fm_eba[i][j],

					scan_eba[i][j]);

				ubi_assert(0);

			}

drivers/mtd/ubi/fastmap-wl.c

+29 −0
Original line number Diff line number Diff line
@@ -171,6 +171,30 @@ void ubi_refill_pools(struct ubi_device *ubi) 
	spin_unlock(&ubi->wl_lock);

}



/**

 * produce_free_peb - produce a free physical eraseblock.

 * @ubi: UBI device description object

 *

 * This function tries to make a free PEB by means of synchronous execution of

 * pending works. This may be needed if, for example the background thread is

 * disabled. Returns zero in case of success and a negative error code in case

 * of failure.

 */

static int produce_free_peb(struct ubi_device *ubi)

{

	int err;



	while (!ubi->free.rb_node && ubi->works_count) {

		dbg_wl("do one work synchronously");

		err = do_work(ubi);



		if (err)

			return err;

	}



	return 0;

}



/**

 * ubi_wl_get_peb - get a physical eraseblock.

 * @ubi: UBI device description object
@@ -213,6 +237,11 @@ int ubi_wl_get_peb(struct ubi_device *ubi) 
		}

		retried = 1;

		up_read(&ubi->fm_eba_sem);

		ret = produce_free_peb(ubi);

		if (ret < 0) {

			down_read(&ubi->fm_eba_sem);

			goto out;

		}

		goto again;

	}

drivers/mtd/ubi/fastmap.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum) 
 * < 0 indicates an internal error.

 */

static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,

		     int *pebs, int pool_size, unsigned long long *max_sqnum,

		     __be32 *pebs, int pool_size, unsigned long long *max_sqnum,

		     struct list_head *free)

{

	struct ubi_vid_hdr *vh;
@@ -775,7 +775,7 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
		for (j = 0; j < be32_to_cpu(fm_eba->reserved_pebs); j++) {

			int pnum = be32_to_cpu(fm_eba->pnum[j]);



			if ((int)be32_to_cpu(fm_eba->pnum[j]) < 0)

			if (pnum < 0)

				continue;



			aeb = NULL;