diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 11:25:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 11:25:00 -0400 |
| commit | 73441c665bee555526b1cf3eef603a0cff0b7e19 (patch) | |
| tree | dcf491e57d8b150527d09503182fd2aa398fd733 /fs | |
| parent | d5a92dd43739f59f77247cfbcbefd229e2948131 (diff) | |
| parent | 8f6cff98477edbcd8ae4976734ba7edd07bdd244 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/jfs_imap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 489a3d63002d..ee9b473b7b80 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c | |||
| @@ -318,7 +318,7 @@ int diRead(struct inode *ip) | |||
| 318 | struct inomap *imap; | 318 | struct inomap *imap; |
| 319 | int block_offset; | 319 | int block_offset; |
| 320 | int inodes_left; | 320 | int inodes_left; |
| 321 | uint pageno; | 321 | unsigned long pageno; |
| 322 | int rel_inode; | 322 | int rel_inode; |
| 323 | 323 | ||
| 324 | jfs_info("diRead: ino = %ld", ip->i_ino); | 324 | jfs_info("diRead: ino = %ld", ip->i_ino); |
| @@ -606,7 +606,7 @@ int diWrite(tid_t tid, struct inode *ip) | |||
| 606 | int block_offset; | 606 | int block_offset; |
| 607 | int inodes_left; | 607 | int inodes_left; |
| 608 | struct metapage *mp; | 608 | struct metapage *mp; |
| 609 | uint pageno; | 609 | unsigned long pageno; |
| 610 | int rel_inode; | 610 | int rel_inode; |
| 611 | int dioffset; | 611 | int dioffset; |
| 612 | struct inode *ipimap; | 612 | struct inode *ipimap; |