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

Commit 194a4ef9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UBI updates from Richard Weinberger:
 "Minor improvements"

* tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs:
  UBI: Fix two typos in comments
  ubi: fastmap: fix spelling mistake: "invalidiate" -> "invalidate"
  ubi: pr_err() strings should end with newlines
  ubi: pr_err() strings should end with newlines
  ubi: pr_err() strings should end with newlines
parents 2896b80e 89b68cd9

drivers/mtd/ubi/block.c

+3 −3
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ int ubiblock_create(struct ubi_volume_info *vi) 
	/* Initialize the gendisk of this ubiblock device */

	gd = alloc_disk(1);

	if (!gd) {

		pr_err("UBI: block: alloc_disk failed");

		pr_err("UBI: block: alloc_disk failed\n");

		ret = -ENODEV;

		goto out_free_dev;

	}
@@ -607,7 +607,7 @@ static void __init ubiblock_create_from_param(void) 
		desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);

		if (IS_ERR(desc)) {

			pr_err(

			       "UBI: block: can't open volume on ubi%d_%d, err=%ld",

			       "UBI: block: can't open volume on ubi%d_%d, err=%ld\n",

			       p->ubi_num, p->vol_id, PTR_ERR(desc));

			continue;

		}
@@ -618,7 +618,7 @@ static void __init ubiblock_create_from_param(void) 
		ret = ubiblock_create(&vi);

		if (ret) {

			pr_err(

			       "UBI: block: can't add '%s' volume on ubi%d_%d, err=%d",

			       "UBI: block: can't add '%s' volume on ubi%d_%d, err=%d\n",

			       vi.name, p->ubi_num, p->vol_id, ret);

			continue;

		}

drivers/mtd/ubi/build.c

+10 −10
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	for (i = 0; i < UBI_MAX_DEVICES; i++) {

		ubi = ubi_devices[i];

		if (ubi && mtd->index == ubi->mtd->index) {

			pr_err("ubi: mtd%d is already attached to ubi%d",

			pr_err("ubi: mtd%d is already attached to ubi%d\n",

				mtd->index, i);

			return -EEXIST;

		}
@@ -840,7 +840,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	 * no sense to attach emulated MTD devices, so we prohibit this.

	 */

	if (mtd->type == MTD_UBIVOLUME) {

		pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI",

		pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI\n",

			mtd->index);

		return -EINVAL;

	}
@@ -851,7 +851,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
			if (!ubi_devices[ubi_num])

				break;

		if (ubi_num == UBI_MAX_DEVICES) {

			pr_err("ubi: only %d UBI devices may be created",

			pr_err("ubi: only %d UBI devices may be created\n",

				UBI_MAX_DEVICES);

			return -ENFILE;

		}
@@ -861,7 +861,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 


		/* Make sure ubi_num is not busy */

		if (ubi_devices[ubi_num]) {

			pr_err("ubi: ubi%i already exists", ubi_num);

			pr_err("ubi: ubi%i already exists\n", ubi_num);

			return -EEXIST;

		}

	}
@@ -1166,7 +1166,7 @@ static int __init ubi_init(void) 
	BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);



	if (mtd_devs > UBI_MAX_DEVICES) {

		pr_err("UBI error: too many MTD devices, maximum is %d",

		pr_err("UBI error: too many MTD devices, maximum is %d\n",

		       UBI_MAX_DEVICES);

		return -EINVAL;

	}
@@ -1178,7 +1178,7 @@ static int __init ubi_init(void) 


	err = misc_register(&ubi_ctrl_cdev);

	if (err) {

		pr_err("UBI error: cannot register device");

		pr_err("UBI error: cannot register device\n");

		goto out;

	}
@@ -1205,7 +1205,7 @@ static int __init ubi_init(void) 
		mtd = open_mtd_device(p->name);

		if (IS_ERR(mtd)) {

			err = PTR_ERR(mtd);

			pr_err("UBI error: cannot open mtd %s, error %d",

			pr_err("UBI error: cannot open mtd %s, error %d\n",

			       p->name, err);

			/* See comment below re-ubi_is_module(). */

			if (ubi_is_module())
@@ -1218,7 +1218,7 @@ static int __init ubi_init(void) 
					 p->vid_hdr_offs, p->max_beb_per1024);

		mutex_unlock(&ubi_devices_mutex);

		if (err < 0) {

			pr_err("UBI error: cannot attach mtd%d",

			pr_err("UBI error: cannot attach mtd%d\n",

			       mtd->index);

			put_mtd_device(mtd);
@@ -1242,7 +1242,7 @@ static int __init ubi_init(void) 


	err = ubiblock_init();

	if (err) {

		pr_err("UBI error: block: cannot initialize, error %d", err);

		pr_err("UBI error: block: cannot initialize, error %d\n", err);



		/* See comment above re-ubi_is_module(). */

		if (ubi_is_module())
@@ -1265,7 +1265,7 @@ static int __init ubi_init(void) 
	misc_deregister(&ubi_ctrl_cdev);

out:

	class_unregister(&ubi_class);

	pr_err("UBI error: cannot initialize UBI, error %d", err);

	pr_err("UBI error: cannot initialize UBI, error %d\n", err);

	return err;

}

late_initcall(ubi_init);

drivers/mtd/ubi/fastmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ int ubi_update_fastmap(struct ubi_device *ubi) 


	ret = invalidate_fastmap(ubi);

	if (ret < 0) {

		ubi_err(ubi, "Unable to invalidiate current fastmap!");

		ubi_err(ubi, "Unable to invalidate current fastmap!");

		ubi_ro_mode(ubi);

	} else {

		return_fm_pebs(ubi, old_fm);

drivers/mtd/ubi/ubi-media.h

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ struct ubi_ec_hdr { 
 * copy. UBI also calculates data CRC when the data is moved and stores it at

 * the @data_crc field of the copy (P1). So when UBI needs to pick one physical

 * eraseblock of two (P or P1), the @copy_flag of the newer one (P1) is

 * examined. If it is cleared, the situation* is simple and the newer one is

 * examined. If it is cleared, the situation is simple and the newer one is

 * picked. If it is set, the data CRC of the copy (P1) is examined. If the CRC

 * checksum is correct, this physical eraseblock is selected (P1). Otherwise

 * the older one (P) is selected.
@@ -389,7 +389,7 @@ struct ubi_vtbl_record { 
#define UBI_FM_POOL_MAGIC	0x67AF4D08

#define UBI_FM_EBA_MAGIC	0xf0c040a8



/* A fastmap supber block can be located between PEB 0 and

/* A fastmap super block can be located between PEB 0 and

 * UBI_FM_MAX_START */

#define UBI_FM_MAX_START	64