Commit 6f7948f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UBI/UBIFS updates from Richard Weinberger:

 - Year 2038 preparations

 - New UBI feature to skip CRC checks of static volumes

 - A new Kconfig option to disable xattrs in UBIFS

 - Lots of fixes in UBIFS, found by our new test framework

* tag 'upstream-4.19-rc1' of git://git.infradead.org/linux-ubifs: (21 commits)
  ubifs: Set default assert action to read-only
  ubifs: Allow setting assert action as mount parameter
  ubifs: Rework ubifs_assert()
  ubifs: Pass struct ubifs_info to ubifs_assert()
  ubifs: Turn two ubifs_assert() into a WARN_ON()
  ubi: expose the volume CRC check skip flag
  ubi: provide a way to skip CRC checks
  ubifs: Use kmalloc_array()
  ubifs: Check data node size before truncate
  Revert "UBIFS: Fix potential integer overflow in allocation"
  ubifs: Add comment on c->commit_sem
  ubifs: introduce Kconfig symbol for xattr support
  ubifs: use swap macro in swap_dirty_idx
  ubifs: tnc: use monotonic znode timestamp
  ubifs: use timespec64 for inode timestamps
  ubifs: xattr: Don't operate on deleted inodes
  ubifs: gc: Fix typo
  ubifs: Fix memory leak in lprobs self-check
  ubi: Initialize Fastmap checkmapping correctly
  ubifs: Fix synced_i_size calculation for xattr inodes
  ...
parents b39d7efc 99a24e02

drivers/mtd/ubi/cdev.c

+11 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf, 
			return count;

		}



		/*

		 * We voluntarily do not take into account the skip_check flag

		 * as we want to make sure what we wrote was correctly written.

		 */

		err = ubi_check_volume(ubi, vol->vol_id);

		if (err < 0)

			return err;
@@ -622,6 +626,13 @@ static int verify_mkvol_req(const struct ubi_device *ubi, 
	    req->vol_type != UBI_STATIC_VOLUME)

		goto bad;



	if (req->flags & ~UBI_VOL_VALID_FLGS)

		goto bad;



	if (req->flags & UBI_VOL_SKIP_CRC_CHECK_FLG &&

	    req->vol_type != UBI_STATIC_VOLUME)

		goto bad;



	if (req->alignment > ubi->leb_size)

		goto bad;

drivers/mtd/ubi/kapi.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode) 
	desc->mode = mode;



	mutex_lock(&ubi->ckvol_mutex);

	if (!vol->checked) {

	if (!vol->checked && !vol->skip_check) {

		/* This is the first open - check the volume */

		err = ubi_check_volume(ubi, vol_id);

		if (err < 0) {

drivers/mtd/ubi/ubi-media.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ enum { 
 * Volume flags used in the volume table record.

 *

 * @UBI_VTBL_AUTORESIZE_FLG: auto-resize this volume

 * @UBI_VTBL_SKIP_CRC_CHECK_FLG: skip the CRC check done on a static volume at

 *				 open time. Should only be set on volumes that

 *				 are used by upper layers doing this kind of

 *				 check. Main use-case for this flag is

 *				 boot-time reduction

 *

 * %UBI_VTBL_AUTORESIZE_FLG flag can be set only for one volume in the volume

 * table. UBI automatically re-sizes the volume which has this flag and makes
@@ -76,6 +81,7 @@ enum { 
 */

enum {

	UBI_VTBL_AUTORESIZE_FLG = 0x01,

	UBI_VTBL_SKIP_CRC_CHECK_FLG = 0x02,

};



/*

drivers/mtd/ubi/ubi.h

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ struct ubi_eba_leb_desc { 
 *           atomic LEB change

 *

 * @eba_tbl: EBA table of this volume (LEB->PEB mapping)

 * @skip_check: %1 if CRC check of this static volume should be skipped.

 *		Directly reflects the presence of the

 *		%UBI_VTBL_SKIP_CRC_CHECK_FLG flag in the vtbl entry

 * @checked: %1 if this static volume was checked

 * @corrupted: %1 if the volume is corrupted (static volumes only)

 * @upd_marker: %1 if the update marker is set for this volume
@@ -374,6 +377,7 @@ struct ubi_volume { 
	void *upd_buf;



	struct ubi_eba_table *eba_tbl;

	unsigned int skip_check:1;

	unsigned int checked:1;

	unsigned int corrupted:1;

	unsigned int upd_marker:1;

drivers/mtd/ubi/vmt.c

+12 −0
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	vol->dev.class = &ubi_class;

	vol->dev.groups = volume_dev_groups;



	if (req->flags & UBI_VOL_SKIP_CRC_CHECK_FLG)

		vol->skip_check = 1;



	spin_lock(&ubi->volumes_lock);

	if (vol_id == UBI_VOL_NUM_AUTO) {

		/* Find unused volume ID */
@@ -299,6 +302,10 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
		vtbl_rec.vol_type = UBI_VID_DYNAMIC;

	else

		vtbl_rec.vol_type = UBI_VID_STATIC;



	if (vol->skip_check)

		vtbl_rec.flags |= UBI_VTBL_SKIP_CRC_CHECK_FLG;



	memcpy(vtbl_rec.name, vol->name, vol->name_len);



	err = ubi_change_vtbl_record(ubi, vol_id, &vtbl_rec);
@@ -733,6 +740,11 @@ static int self_check_volume(struct ubi_device *ubi, int vol_id) 
			ubi_err(ubi, "bad used_bytes");

			goto fail;

		}



		if (vol->skip_check) {

			ubi_err(ubi, "bad skip_check");

			goto fail;

		}

	} else {

		if (vol->used_ebs < 0 || vol->used_ebs > vol->reserved_pebs) {

			ubi_err(ubi, "bad used_ebs");

CRA Git | Maintained and supported by SUSTech CRA and CCSE