Commit 0ef675d4 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Linus Torvalds
Browse files

[PATCH] mtd: 64 bit fixes 



Fix some bugs in mtd/jffs2 on 64bit platform.

The MEMGETBADBLOCK/MEMSETBADBLOCK ioctl are not listed in compat_ioctl.h.

And some variables in jffs2 are declared as uint32_t but used to hold
size_t values.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eff2c2f6

fs/jffs2/nodelist.c

+2 −1
Original line number Diff line number Diff line
@@ -406,7 +406,8 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info 
	int err = 0, pointed = 0;

	struct jffs2_eraseblock *jeb;

	unsigned char *buffer;

	uint32_t crc, ofs, retlen, len;

	uint32_t crc, ofs, len;

	size_t retlen;



	BUG_ON(tn->csize == 0);

fs/jffs2/readinode.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct jffs2_raw_node_ref *jffs2_first_valid_node(struct jffs2_raw_node_r 
 * 	    negative error code on failure.

 */

static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,

				struct jffs2_raw_dirent *rd, uint32_t read, struct jffs2_full_dirent **fdp,

				struct jffs2_raw_dirent *rd, size_t read, struct jffs2_full_dirent **fdp,

				uint32_t *latest_mctime, uint32_t *mctime_ver)

{

	struct jffs2_full_dirent *fd;

include/linux/compat_ioctl.h

+2 −0
Original line number Diff line number Diff line
@@ -696,6 +696,8 @@ COMPATIBLE_IOCTL(MEMLOCK) 
COMPATIBLE_IOCTL(MEMUNLOCK)

COMPATIBLE_IOCTL(MEMGETREGIONCOUNT)

COMPATIBLE_IOCTL(MEMGETREGIONINFO)

COMPATIBLE_IOCTL(MEMGETBADBLOCK)

COMPATIBLE_IOCTL(MEMSETBADBLOCK)

/* NBD */

ULONG_IOCTL(NBD_SET_SOCK)

ULONG_IOCTL(NBD_SET_BLKSIZE)