Commit 787fec8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull jffs2, ubi and ubifs updates from Richard Weinberger:
 "JFFS2:
   - Fix for a remount regression
   - Fix for an abnormal GC exit
   - Fix for a possible NULL pointer issue while mounting

  UBI:
   - Add support ECC-ed NOR flash
   - Removal of dead code

  UBIFS:
   - Make node dumping debug code more reliable
   - Various cleanups: less ifdefs, less typos
   - Fix for an info leak"

* tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: ubifs_dump_node: Dump all branches of the index node
  ubifs: ubifs_dump_sleb: Remove unused function
  ubifs: Pass node length in all node dumping callers
  Revert "ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len"
  ubifs: Limit dumping length by size of memory which is allocated for the node
  ubifs: Remove the redundant return in dbg_check_nondata_nodes_order
  jffs2: Fix NULL pointer dereference in rp_size fs option parsing
  ubifs: Fixed print foramt mismatch in ubifs
  ubi: Do not zero out EC and VID on ECC-ed NOR flashes
  jffs2: remove trailing semicolon in macro definition
  ubifs: Fix error return code in ubifs_init_authentication()
  ubifs: wbuf: Don't leak kernel memory to flash
  ubi: Remove useless code in bytes_str_to_int
  ubifs: Fix the printing type of c->big_lpt
  jffs2: Allow setting rp_size to zero during remounting
  jffs2: Fix ignoring mounting options problem during remounting
  jffs2: Fix GC exit abnormally
  ubifs: Code cleanup by removing ifdef macro surrounding
  jffs2: Fix if/else empty body warnings
  ubifs: Delete duplicated words + other fixes
parents e13300bd b80a974b

drivers/mtd/ubi/build.c

+1 −5
Original line number Diff line number Diff line
@@ -629,10 +629,8 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024) 
		ubi->bad_peb_limit = get_bad_peb_limit(ubi, max_beb_per1024);

	}



	if (ubi->mtd->type == MTD_NORFLASH) {

		ubi_assert(ubi->mtd->writesize == 1);

	if (ubi->mtd->type == MTD_NORFLASH)

		ubi->nor_flash = 1;

	}



	ubi->min_io_size = ubi->mtd->writesize;

	ubi->hdrs_min_io_size = ubi->mtd->writesize >> ubi->mtd->subpage_sft;
@@ -1352,8 +1350,6 @@ static int bytes_str_to_int(const char *str) 
		fallthrough;

	case 'K':

		result *= 1024;

		if (endp[1] == 'i' && endp[2] == 'B')

			endp += 2;

	case '\0':

		break;

	default:

drivers/mtd/ubi/io.c

+8 −1
Original line number Diff line number Diff line
@@ -535,7 +535,14 @@ int ubi_io_sync_erase(struct ubi_device *ubi, int pnum, int torture) 
		return -EROFS;

	}



	if (ubi->nor_flash) {

	/*

	 * If the flash is ECC-ed then we have to erase the ECC block before we

	 * can write to it. But the write is in preparation to an erase in the

	 * first place. This means we cannot zero out EC and VID before the

	 * erase and we just have to hope the flash starts erasing from the

	 * start of the page.

	 */

	if (ubi->nor_flash && ubi->mtd->writesize == 1) {

		err = nor_erase_prepare(ubi, pnum);

		if (err)

			return err;

fs/jffs2/debug.h

+12 −11
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#ifndef _JFFS2_DEBUG_H_

#define _JFFS2_DEBUG_H_



#include <linux/printk.h>

#include <linux/sched.h>



#ifndef CONFIG_JFFS2_FS_DEBUG
@@ -99,73 +100,73 @@ do { \ 
#ifdef JFFS2_DBG_READINODE_MESSAGES

#define dbg_readinode(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_readinode(fmt, ...)

#define dbg_readinode(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif

#ifdef JFFS2_DBG_READINODE2_MESSAGES

#define dbg_readinode2(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_readinode2(fmt, ...)

#define dbg_readinode2(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Fragtree build debugging messages */

#ifdef JFFS2_DBG_FRAGTREE_MESSAGES

#define dbg_fragtree(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_fragtree(fmt, ...)

#define dbg_fragtree(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif

#ifdef JFFS2_DBG_FRAGTREE2_MESSAGES

#define dbg_fragtree2(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_fragtree2(fmt, ...)

#define dbg_fragtree2(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Directory entry list manilulation debugging messages */

#ifdef JFFS2_DBG_DENTLIST_MESSAGES

#define dbg_dentlist(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_dentlist(fmt, ...)

#define dbg_dentlist(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Print the messages about manipulating node_refs */

#ifdef JFFS2_DBG_NODEREF_MESSAGES

#define dbg_noderef(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_noderef(fmt, ...)

#define dbg_noderef(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Manipulations with the list of inodes (JFFS2 inocache) */

#ifdef JFFS2_DBG_INOCACHE_MESSAGES

#define dbg_inocache(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_inocache(fmt, ...)

#define dbg_inocache(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Summary debugging messages */

#ifdef JFFS2_DBG_SUMMARY_MESSAGES

#define dbg_summary(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_summary(fmt, ...)

#define dbg_summary(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* File system build messages */

#ifdef JFFS2_DBG_FSBUILD_MESSAGES

#define dbg_fsbuild(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_fsbuild(fmt, ...)

#define dbg_fsbuild(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Watch the object allocations */

#ifdef JFFS2_DBG_MEMALLOC_MESSAGES

#define dbg_memalloc(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_memalloc(fmt, ...)

#define dbg_memalloc(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/* Watch the XATTR subsystem */

#ifdef JFFS2_DBG_XATTR_MESSAGES

#define dbg_xattr(fmt, ...)  JFFS2_DEBUG(fmt, ##__VA_ARGS__)

#else

#define dbg_xattr(fmt, ...)

#define dbg_xattr(fmt, ...)  no_printk(fmt, ##__VA_ARGS__)

#endif 



/* "Sanity" checks */

fs/jffs2/jffs2_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct jffs2_mount_opts { 
	 * users. This is implemented simply by means of not allowing the

	 * latter users to write to the file system if the amount if the

	 * available space is less then 'rp_size'. */

	bool set_rp_size;

	unsigned int rp_size;

};

fs/jffs2/nodelist.h

+2 −2
Original line number Diff line number Diff line
@@ -349,14 +349,14 @@ static inline struct jffs2_node_frag *frag_last(struct rb_root *root) 
#define frag_parent(frag) rb_entry(rb_parent(&(frag)->rb), struct jffs2_node_frag, rb)

#define frag_left(frag) rb_entry((frag)->rb.rb_left, struct jffs2_node_frag, rb)

#define frag_right(frag) rb_entry((frag)->rb.rb_right, struct jffs2_node_frag, rb)

#define frag_erase(frag, list) rb_erase(&frag->rb, list);

#define frag_erase(frag, list) rb_erase(&frag->rb, list)



#define tn_next(tn) rb_entry(rb_next(&(tn)->rb), struct jffs2_tmp_dnode_info, rb)

#define tn_prev(tn) rb_entry(rb_prev(&(tn)->rb), struct jffs2_tmp_dnode_info, rb)

#define tn_parent(tn) rb_entry(rb_parent(&(tn)->rb), struct jffs2_tmp_dnode_info, rb)

#define tn_left(tn) rb_entry((tn)->rb.rb_left, struct jffs2_tmp_dnode_info, rb)

#define tn_right(tn) rb_entry((tn)->rb.rb_right, struct jffs2_tmp_dnode_info, rb)

#define tn_erase(tn, list) rb_erase(&tn->rb, list);

#define tn_erase(tn, list) rb_erase(&tn->rb, list)

#define tn_last(list) rb_entry(rb_last(list), struct jffs2_tmp_dnode_info, rb)

#define tn_first(list) rb_entry(rb_first(list), struct jffs2_tmp_dnode_info, rb)

CRA Git | Maintained and supported by SUSTech CRA and CCSE