Commit b36a261e authored by Richard Weinberger's avatar Richard Weinberger Committed by Artem Bityutskiy
Browse files

UBI: Kill data type hint 



We do not need this feature and to our shame it even was not working
and there was a bug found very recently.
	-- Artem Bityutskiy

Without the data type hint UBI2 (fastmap) will be easier to implement.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 0964f6a2

drivers/mtd/ubi/cdev.c

+2 −6
Original line number Diff line number Diff line
@@ -334,8 +334,7 @@ static ssize_t vol_cdev_direct_write(struct file *file, const char __user *buf, 
			break;

		}



		err = ubi_eba_write_leb(ubi, vol, lnum, tbuf, off, len,

					UBI_UNKNOWN);

		err = ubi_eba_write_leb(ubi, vol, lnum, tbuf, off, len);

		if (err)

			break;
@@ -477,9 +476,6 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, 
		if (req.lnum < 0 || req.lnum >= vol->reserved_pebs ||

		    req.bytes < 0 || req.lnum >= vol->usable_leb_size)

			break;

		if (req.dtype != UBI_LONGTERM && req.dtype != UBI_SHORTTERM &&

		    req.dtype != UBI_UNKNOWN)

			break;



		err = get_exclusive(desc);

		if (err < 0)
@@ -532,7 +528,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, 
			err = -EFAULT;

			break;

		}

		err = ubi_leb_map(desc, req.lnum, req.dtype);

		err = ubi_leb_map(desc, req.lnum);

		break;

	}

drivers/mtd/ubi/eba.c

+8 −12
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
		return -ENOMEM;



retry:

	new_pnum = ubi_wl_get_peb(ubi, UBI_UNKNOWN);

	new_pnum = ubi_wl_get_peb(ubi);

	if (new_pnum < 0) {

		ubi_free_vid_hdr(ubi, vid_hdr);

		return new_pnum;
@@ -585,7 +585,6 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
 * @buf: the data to write

 * @offset: offset within the logical eraseblock where to write

 * @len: how many bytes to write

 * @dtype: data type

 *

 * This function writes data to logical eraseblock @lnum of a dynamic volume

 * @vol. Returns zero in case of success and a negative error code in case
@@ -593,7 +592,7 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
 * written to the flash media, but may be some garbage.

 */

int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,

		      const void *buf, int offset, int len, int dtype)

		      const void *buf, int offset, int len)

{

	int err, pnum, tries = 0, vol_id = vol->vol_id;

	struct ubi_vid_hdr *vid_hdr;
@@ -641,7 +640,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
	vid_hdr->data_pad = cpu_to_be32(vol->data_pad);



retry:

	pnum = ubi_wl_get_peb(ubi, dtype);

	pnum = ubi_wl_get_peb(ubi);

	if (pnum < 0) {

		ubi_free_vid_hdr(ubi, vid_hdr);

		leb_write_unlock(ubi, vol_id, lnum);
@@ -707,7 +706,6 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
 * @lnum: logical eraseblock number

 * @buf: data to write

 * @len: how many bytes to write

 * @dtype: data type

 * @used_ebs: how many logical eraseblocks will this volume contain

 *

 * This function writes data to logical eraseblock @lnum of static volume
@@ -724,8 +722,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
 * code in case of failure.

 */

int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol,

			 int lnum, const void *buf, int len, int dtype,

			 int used_ebs)

			 int lnum, const void *buf, int len, int used_ebs)

{

	int err, pnum, tries = 0, data_size = len, vol_id = vol->vol_id;

	struct ubi_vid_hdr *vid_hdr;
@@ -763,7 +760,7 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
	vid_hdr->data_crc = cpu_to_be32(crc);



retry:

	pnum = ubi_wl_get_peb(ubi, dtype);

	pnum = ubi_wl_get_peb(ubi);

	if (pnum < 0) {

		ubi_free_vid_hdr(ubi, vid_hdr);

		leb_write_unlock(ubi, vol_id, lnum);
@@ -827,7 +824,6 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
 * @lnum: logical eraseblock number

 * @buf: data to write

 * @len: how many bytes to write

 * @dtype: data type

 *

 * This function changes the contents of a logical eraseblock atomically. @buf

 * has to contain new logical eraseblock data, and @len - the length of the
@@ -839,7 +835,7 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
 * LEB change may be done at a time. This is ensured by @ubi->alc_mutex.

 */

int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol,

			      int lnum, const void *buf, int len, int dtype)

			      int lnum, const void *buf, int len)

{

	int err, pnum, tries = 0, vol_id = vol->vol_id;

	struct ubi_vid_hdr *vid_hdr;
@@ -856,7 +852,7 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
		err = ubi_eba_unmap_leb(ubi, vol, lnum);

		if (err)

			return err;

		return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0, dtype);

		return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0);

	}



	vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
@@ -881,7 +877,7 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
	vid_hdr->data_crc = cpu_to_be32(crc);



retry:

	pnum = ubi_wl_get_peb(ubi, dtype);

	pnum = ubi_wl_get_peb(ubi);

	if (pnum < 0) {

		err = pnum;

		goto out_leb_unlock;

drivers/mtd/ubi/gluebi.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static int gluebi_write(struct mtd_info *mtd, loff_t to, size_t len, 
		if (to_write > total_written)

			to_write = total_written;



		err = ubi_write(gluebi->desc, lnum, buf, offs, to_write);

		err = ubi_leb_write(gluebi->desc, lnum, buf, offs, to_write);

		if (err)

			break;

drivers/mtd/ubi/kapi.c

+7 −23
Original line number Diff line number Diff line
@@ -426,11 +426,9 @@ EXPORT_SYMBOL_GPL(ubi_leb_read); 
 * @buf: data to write

 * @offset: offset within the logical eraseblock where to write

 * @len: how many bytes to write

 * @dtype: expected data type

 *

 * This function writes @len bytes of data from @buf to offset @offset of

 * logical eraseblock @lnum. The @dtype argument describes expected lifetime of

 * the data.

 * logical eraseblock @lnum.

 *

 * This function takes care of physical eraseblock write failures. If write to

 * the physical eraseblock write operation fails, the logical eraseblock is
@@ -447,7 +445,7 @@ EXPORT_SYMBOL_GPL(ubi_leb_read); 
 * returns immediately with %-EBADF code.

 */

int ubi_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf,

		  int offset, int len, int dtype)

		  int offset, int len)

{

	struct ubi_volume *vol = desc->vol;

	struct ubi_device *ubi = vol->ubi;
@@ -466,17 +464,13 @@ int ubi_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, 
	    offset & (ubi->min_io_size - 1) || len & (ubi->min_io_size - 1))

		return -EINVAL;



	if (dtype != UBI_LONGTERM && dtype != UBI_SHORTTERM &&

	    dtype != UBI_UNKNOWN)

		return -EINVAL;



	if (vol->upd_marker)

		return -EBADF;



	if (len == 0)

		return 0;



	return ubi_eba_write_leb(ubi, vol, lnum, buf, offset, len, dtype);

	return ubi_eba_write_leb(ubi, vol, lnum, buf, offset, len);

}

EXPORT_SYMBOL_GPL(ubi_leb_write);
@@ -486,7 +480,6 @@ EXPORT_SYMBOL_GPL(ubi_leb_write); 
 * @lnum: logical eraseblock number to change

 * @buf: data to write

 * @len: how many bytes to write

 * @dtype: expected data type

 *

 * This function changes the contents of a logical eraseblock atomically. @buf

 * has to contain new logical eraseblock data, and @len - the length of the
@@ -497,7 +490,7 @@ EXPORT_SYMBOL_GPL(ubi_leb_write); 
 * code in case of failure.

 */

int ubi_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf,

		   int len, int dtype)

		   int len)

{

	struct ubi_volume *vol = desc->vol;

	struct ubi_device *ubi = vol->ubi;
@@ -515,17 +508,13 @@ int ubi_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf, 
	    len > vol->usable_leb_size || len & (ubi->min_io_size - 1))

		return -EINVAL;



	if (dtype != UBI_LONGTERM && dtype != UBI_SHORTTERM &&

	    dtype != UBI_UNKNOWN)

		return -EINVAL;



	if (vol->upd_marker)

		return -EBADF;



	if (len == 0)

		return 0;



	return ubi_eba_atomic_leb_change(ubi, vol, lnum, buf, len, dtype);

	return ubi_eba_atomic_leb_change(ubi, vol, lnum, buf, len);

}

EXPORT_SYMBOL_GPL(ubi_leb_change);
@@ -626,7 +615,6 @@ EXPORT_SYMBOL_GPL(ubi_leb_unmap); 
 * ubi_leb_map - map logical eraseblock to a physical eraseblock.

 * @desc: volume descriptor

 * @lnum: logical eraseblock number

 * @dtype: expected data type

 *

 * This function maps an un-mapped logical eraseblock @lnum to a physical

 * eraseblock. This means, that after a successful invocation of this
@@ -639,7 +627,7 @@ EXPORT_SYMBOL_GPL(ubi_leb_unmap); 
 * eraseblock is already mapped, and other negative error codes in case of

 * other failures.

 */

int ubi_leb_map(struct ubi_volume_desc *desc, int lnum, int dtype)

int ubi_leb_map(struct ubi_volume_desc *desc, int lnum)

{

	struct ubi_volume *vol = desc->vol;

	struct ubi_device *ubi = vol->ubi;
@@ -652,17 +640,13 @@ int ubi_leb_map(struct ubi_volume_desc *desc, int lnum, int dtype) 
	if (lnum < 0 || lnum >= vol->reserved_pebs)

		return -EINVAL;



	if (dtype != UBI_LONGTERM && dtype != UBI_SHORTTERM &&

	    dtype != UBI_UNKNOWN)

		return -EINVAL;



	if (vol->upd_marker)

		return -EBADF;



	if (vol->eba_tbl[lnum] >= 0)

		return -EBADMSG;



	return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0, dtype);

	return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0);

}

EXPORT_SYMBOL_GPL(ubi_leb_map);

drivers/mtd/ubi/ubi.h

+4 −8
Original line number Diff line number Diff line
@@ -222,8 +222,6 @@ struct ubi_volume_desc; 
 * @upd_ebs: how many eraseblocks are expected to be updated

 * @ch_lnum: LEB number which is being changing by the atomic LEB change

 *           operation

 * @ch_dtype: data persistency type which is being changing by the atomic LEB

 *            change operation

 * @upd_bytes: how many bytes are expected to be received for volume update or

 *             atomic LEB change

 * @upd_received: how many bytes were already received for volume update or
@@ -270,7 +268,6 @@ struct ubi_volume { 


	int upd_ebs;

	int ch_lnum;

	int ch_dtype;

	long long upd_bytes;

	long long upd_received;

	void *upd_buf;
@@ -525,18 +522,17 @@ int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol, 
int ubi_eba_read_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,

		     void *buf, int offset, int len, int check);

int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,

		      const void *buf, int offset, int len, int dtype);

		      const void *buf, int offset, int len);

int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol,

			 int lnum, const void *buf, int len, int dtype,

			 int used_ebs);

			 int lnum, const void *buf, int len, int used_ebs);

int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol,

			      int lnum, const void *buf, int len, int dtype);

			      int lnum, const void *buf, int len);

int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,

		     struct ubi_vid_hdr *vid_hdr);

int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si);



/* wl.c */

int ubi_wl_get_peb(struct ubi_device *ubi, int dtype);

int ubi_wl_get_peb(struct ubi_device *ubi);

int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture);

int ubi_wl_flush(struct ubi_device *ubi);

int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum);