Commit 70e3083e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ubifs-for-linus-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs 

Pull UBI and UBIFS updates from Richard Weinberger:
 "UBIFS:
   - Misc code cleanups such as removal of unnecessary variables

  UBI:
   - No longer program unused bit in UBI headers"

* tag 'ubifs-for-linus-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: vmalloc(array_size()) -> vmalloc_array()
  ubi: fastmap: fix ubi->fm memory leak
  mtd: ubi: skip programming unused bits in ubi headers
  ubifs: Remove unnecessary variable assignments
  ubifs: Simplify the code using ubifs_crc_node
  ubifs: Remove unnecessary parameters '*c'
parents b88b2f82 0695aef2

drivers/mtd/ubi/attach.c

+3 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) 


	err = ubi_read_volume_table(ubi, ai);

	if (err)

		goto out_ai;

		goto out_fm;



	err = ubi_wl_init(ubi, ai);

	if (err)
@@ -1642,6 +1642,8 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) 
out_vtbl:

	ubi_free_all_volumes(ubi);

	vfree(ubi->vtbl);

out_fm:

	ubi_free_fastmap(ubi);

out_ai:

	destroy_ai(ai);

	return err;

drivers/mtd/ubi/fastmap-wl.c

+1 −7
Original line number Diff line number Diff line
@@ -530,8 +530,6 @@ int ubi_is_erase_work(struct ubi_work *wrk) 


static void ubi_fastmap_close(struct ubi_device *ubi)

{

	int i;



	return_unused_pool_pebs(ubi, &ubi->fm_pool);

	return_unused_pool_pebs(ubi, &ubi->fm_wl_pool);
@@ -540,11 +538,7 @@ static void ubi_fastmap_close(struct ubi_device *ubi) 
		ubi->fm_anchor = NULL;

	}



	if (ubi->fm) {

		for (i = 0; i < ubi->fm->used_blocks; i++)

			kfree(ubi->fm->e[i]);

	}

	kfree(ubi->fm);

	ubi_free_fastmap(ubi);

}



/**

drivers/mtd/ubi/io.c

+10 −0
Original line number Diff line number Diff line
@@ -868,6 +868,8 @@ int ubi_io_write_ec_hdr(struct ubi_device *ubi, int pnum, 
		return -EROFS;

	}



	memset((char *)ec_hdr + UBI_EC_HDR_SIZE, 0xFF, ubi->ec_hdr_alsize - UBI_EC_HDR_SIZE);



	err = ubi_io_write(ubi, ec_hdr, pnum, 0, ubi->ec_hdr_alsize);

	return err;

}
@@ -1150,6 +1152,14 @@ int ubi_io_write_vid_hdr(struct ubi_device *ubi, int pnum, 
		return -EROFS;

	}



	if (ubi->vid_hdr_shift) {

		memset((char *)p, 0xFF, ubi->vid_hdr_shift);

		memset((char *)p + ubi->vid_hdr_shift + UBI_VID_HDR_SIZE, 0xFF,

		       ubi->vid_hdr_alsize - (ubi->vid_hdr_shift + UBI_VID_HDR_SIZE));

	} else {

		memset((char *)p + UBI_VID_HDR_SIZE, 0xFF, ubi->vid_hdr_alsize - UBI_VID_HDR_SIZE);

	}



	err = ubi_io_write(ubi, p, pnum, ubi->vid_hdr_aloffset,

			   ubi->vid_hdr_alsize);

	return err;

drivers/mtd/ubi/ubi.h

+12 −0
Original line number Diff line number Diff line
@@ -969,10 +969,22 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai, 
		     struct ubi_attach_info *scan_ai);

int ubi_fastmap_init_checkmap(struct ubi_volume *vol, int leb_count);

void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol);

static inline void ubi_free_fastmap(struct ubi_device *ubi)

{

	if (ubi->fm) {

		int i;



		for (i = 0; i < ubi->fm->used_blocks; i++)

			kmem_cache_free(ubi_wl_entry_slab, ubi->fm->e[i]);

		kfree(ubi->fm);

		ubi->fm = NULL;

	}

}

#else

static inline int ubi_update_fastmap(struct ubi_device *ubi) { return 0; }

static inline int ubi_fastmap_init_checkmap(struct ubi_volume *vol, int leb_count) { return 0; }

static inline void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol) {}

static inline void ubi_free_fastmap(struct ubi_device *ubi) { }

#endif



/* block.c */

fs/ubifs/io.c

+4 −9
Original line number Diff line number Diff line
@@ -327,8 +327,6 @@ int ubifs_check_node(const struct ubifs_info *c, const void *buf, int len, 
 */

void ubifs_pad(const struct ubifs_info *c, void *buf, int pad)

{

	uint32_t crc;



	ubifs_assert(c, pad >= 0);



	if (pad >= UBIFS_PAD_NODE_SZ) {
@@ -343,8 +341,7 @@ void ubifs_pad(const struct ubifs_info *c, void *buf, int pad) 
		ch->len = cpu_to_le32(UBIFS_PAD_NODE_SZ);

		pad -= UBIFS_PAD_NODE_SZ;

		pad_node->pad_len = cpu_to_le32(pad);

		crc = crc32(UBIFS_CRC32_INIT, buf + 8, UBIFS_PAD_NODE_SZ - 8);

		ch->crc = cpu_to_le32(crc);

		ubifs_crc_node(buf, UBIFS_PAD_NODE_SZ);

		memset(buf + UBIFS_PAD_NODE_SZ, 0, pad);

	} else if (pad > 0)

		/* Too little space, padding node won't fit */
@@ -395,7 +392,7 @@ void ubifs_init_node(struct ubifs_info *c, void *node, int len, int pad) 
	}

}



void ubifs_crc_node(struct ubifs_info *c, void *node, int len)

void ubifs_crc_node(void *node, int len)

{

	struct ubifs_ch *ch = node;

	uint32_t crc;
@@ -432,7 +429,7 @@ int ubifs_prepare_node_hmac(struct ubifs_info *c, void *node, int len, 
			return err;

	}



	ubifs_crc_node(c, node, len);

	ubifs_crc_node(node, len);



	return 0;

}
@@ -469,7 +466,6 @@ void ubifs_prepare_node(struct ubifs_info *c, void *node, int len, int pad) 
 */

void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last)

{

	uint32_t crc;

	struct ubifs_ch *ch = node;

	unsigned long long sqnum = next_sqnum(c);
@@ -483,8 +479,7 @@ void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last) 
		ch->group_type = UBIFS_IN_NODE_GROUP;

	ch->sqnum = cpu_to_le64(sqnum);

	ch->padding[0] = ch->padding[1] = 0;

	crc = crc32(UBIFS_CRC32_INIT, node + 8, len - 8);

	ch->crc = cpu_to_le32(crc);

	ubifs_crc_node(node, len);

}



/**