Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73441c66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: pageno needs to be long
parents d5a92dd4 8f6cff98

fs/jfs/jfs_imap.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int diRead(struct inode *ip) 
	struct inomap *imap;

	int block_offset;

	int inodes_left;

	uint pageno;

	unsigned long pageno;

	int rel_inode;



	jfs_info("diRead: ino = %ld", ip->i_ino);
@@ -606,7 +606,7 @@ int diWrite(tid_t tid, struct inode *ip) 
	int block_offset;

	int inodes_left;

	struct metapage *mp;

	uint pageno;

	unsigned long pageno;

	int rel_inode;

	int dioffset;

	struct inode *ipimap;