Commit 51f62944 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull JFFS2, UBI and UBIFS updates from Richard Weinberger:
 "JFFS2:
   - Use splice_write()
   - Fix for a slab-out-of-bounds bug

  UBI:
   - Fix for clang related warnings
   - Code cleanup

  UBIFS:
   - Fix for inode rebirth at replay
   - Set s_uuid
   - Use zstd for default filesystem"

* tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubi: Remove unnecessary struct declaration
  jffs2: Hook up splice_write callback
  jffs2: avoid Wempty-body warnings
  jffs2: Fix kasan slab-out-of-bounds problem
  ubi: Fix fall-through warnings for Clang
  ubifs: Report max LEB count at mount time
  ubifs: Set s_uuid in super block to support ima/evm uuid options
  ubifs: Default to zstd compression
  ubifs: Only check replay with inode type to judge if inode linked
parents d0195c7d 9a29f7f0

drivers/mtd/ubi/build.c

+1 −0
Original line number Diff line number Diff line
@@ -1350,6 +1350,7 @@ static int bytes_str_to_int(const char *str) 
		fallthrough;

	case 'K':

		result *= 1024;

		break;

	case '\0':

		break;

	default:

drivers/mtd/ubi/ubi.h

+0 −2
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ struct ubi_volume_desc { 
	int mode;

};



struct ubi_wl_entry;



/**

 * struct ubi_debug_info - debugging information for an UBI device.

 *

fs/jffs2/file.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ const struct file_operations jffs2_file_operations = 
	.mmap =		generic_file_readonly_mmap,

	.fsync =	jffs2_fsync,

	.splice_read =	generic_file_splice_read,

	.splice_write = iter_file_splice_write,

};



/* jffs2_file_inode_operations */

fs/jffs2/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo 
	memcpy(&fd->name, rd->name, checkedlen);

	fd->name[checkedlen] = 0;



	crc = crc32(0, fd->name, rd->nsize);

	crc = crc32(0, fd->name, checkedlen);

	if (crc != je32_to_cpu(rd->name_crc)) {

		pr_notice("%s(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",

			  __func__, ofs, je32_to_cpu(rd->name_crc), crc);

fs/jffs2/summary.h

+8 −8
Original line number Diff line number Diff line
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb 


#define jffs2_sum_active() (0)

#define jffs2_sum_init(a) (0)

#define jffs2_sum_exit(a)

#define jffs2_sum_exit(a) do { } while (0)

#define jffs2_sum_disable_collecting(a)

#define jffs2_sum_is_disabled(a) (0)

#define jffs2_sum_reset_collected(a)

#define jffs2_sum_reset_collected(a) do { } while (0)

#define jffs2_sum_add_kvec(a,b,c,d) (0)

#define jffs2_sum_move_collected(a,b)

#define jffs2_sum_move_collected(a,b) do { } while (0)

#define jffs2_sum_write_sumnode(a) (0)

#define jffs2_sum_add_padding_mem(a,b)

#define jffs2_sum_add_inode_mem(a,b,c)

#define jffs2_sum_add_dirent_mem(a,b,c)

#define jffs2_sum_add_xattr_mem(a,b,c)

#define jffs2_sum_add_xref_mem(a,b,c)

#define jffs2_sum_add_padding_mem(a,b) do { } while (0)

#define jffs2_sum_add_inode_mem(a,b,c) do { } while (0)

#define jffs2_sum_add_dirent_mem(a,b,c) do { } while (0)

#define jffs2_sum_add_xattr_mem(a,b,c) do { } while (0)

#define jffs2_sum_add_xref_mem(a,b,c) do { } while (0)

#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)



#endif /* CONFIG_JFFS2_SUMMARY */