Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs (23a3e178) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-class-ubi

+9 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <dedekind@infradead.org>
		Description:
		Number of physical eraseblocks reserved for bad block handling.

		What: /sys/class/ubi/ubiX/ro_mode
		Date: April 2016
		KernelVersion: 4.7
		Contact: linux-mtd@lists.infradead.org
		Description:
		Contains ASCII "1\n" if the read-only flag is set on this
		device, and "0\n" if it is cleared. UBI devices mark themselves
		as read-only when they detect an unrecoverable error.

		What: /sys/class/ubi/ubiX/total_eraseblocks
		Date: July 2006
		KernelVersion: 2.6.22

+5 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,8 @@ static struct device_attribute dev_bgt_enabled =
		__ATTR(bgt_enabled, S_IRUGO, dev_attribute_show, NULL);
		static struct device_attribute dev_mtd_num =
		__ATTR(mtd_num, S_IRUGO, dev_attribute_show, NULL);
		static struct device_attribute dev_ro_mode =
		__ATTR(ro_mode, S_IRUGO, dev_attribute_show, NULL);

		/**
		* ubi_volume_notify - send a volume change notification.
		@@ -385,6 +387,8 @@ static ssize_t dev_attribute_show(struct device *dev,
		ret = sprintf(buf, "%d\n", ubi->thread_enabled);
		else if (attr == &dev_mtd_num)
		ret = sprintf(buf, "%d\n", ubi->mtd->index);
		else if (attr == &dev_ro_mode)
		ret = sprintf(buf, "%d\n", ubi->ro_mode);
		else
		ret = -EINVAL;

		@@ -404,6 +408,7 @@ static struct attribute *ubi_dev_attrs[] = {
		&dev_min_io_size.attr,
		&dev_bgt_enabled.attr,
		&dev_mtd_num.attr,
		&dev_ro_mode.attr,
		NULL
		};
		ATTRIBUTE_GROUPS(ubi_dev);

+2 −1

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ static ssize_t dfs_file_write(struct file file, const char __user user_buf,
		} else if (dent == d->dfs_emulate_power_cut) {
		if (kstrtoint(buf, 0, &val) != 0)
		count = -EINVAL;
		else
		d->emulate_power_cut = val;
		goto out;
		}

+19 −28

Original line number	Diff line number	Diff line
		@@ -425,11 +425,28 @@ retry:
		ubi_warn(ubi, "corrupted VID header at PEB %d, LEB %d:%d",
		pnum, vol_id, lnum);
		err = -EBADMSG;
		} else {
		/*
		* Ending up here in the non-Fastmap case
		* is a clear bug as the VID header had to
		* be present at scan time to have it referenced.
		* With fastmap the story is more complicated.
		* Fastmap has the mapping info without the need
		* of a full scan. So the LEB could have been
		* unmapped, Fastmap cannot know this and keeps
		* the LEB referenced.
		* This is valid and works as the layer above UBI
		* has to do bookkeeping about used/referenced
		* LEBs in any case.
		*/
		if (ubi->fast_attach) {
		err = -EBADMSG;
		} else {
		err = -EINVAL;
		ubi_ro_mode(ubi);
		}
		}
		}
		goto out_free;
		} else if (err == UBI_IO_BITFLIPS)
		scrub = 1;
		@@ -1202,32 +1219,6 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
		}

		cond_resched();

		/*
		* We've written the data and are going to read it back to make
		* sure it was written correctly.
		*/
		memset(ubi->peb_buf, 0xFF, aldata_size);
		err = ubi_io_read_data(ubi, ubi->peb_buf, to, 0, aldata_size);
		if (err) {
		if (err != UBI_IO_BITFLIPS) {
		ubi_warn(ubi, "error %d while reading data back from PEB %d",
		err, to);
		if (is_error_sane(err))
		err = MOVE_TARGET_RD_ERR;
		} else
		err = MOVE_TARGET_BITFLIPS;
		goto out_unlock_buf;
		}

		cond_resched();

		if (crc != crc32(UBI_CRC32_INIT, ubi->peb_buf, data_size)) {
		ubi_warn(ubi, "read data back from PEB %d and it is different",
		to);
		err = -EINVAL;
		goto out_unlock_buf;
		}
		}

		ubi_assert(vol->eba_tbl[lnum] == from);

+1 −0

Original line number	Diff line number	Diff line
		@@ -1058,6 +1058,7 @@ int ubi_scan_fastmap(struct ubi_device ubi, struct ubi_attach_info ai,
		ubi_msg(ubi, "fastmap WL pool size: %d",
		ubi->fm_wl_pool.max_size);
		ubi->fm_disabled = 0;
		ubi->fast_attach = 1;

		ubi_free_vid_hdr(ubi, vh);
		kfree(ech);