Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Oct 23, 2006
2 parents d5a92dd + 8f6cff9 commit 73441c6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/jfs/jfs_imap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 73441c6

Please sign in to comment.