summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 08:25:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 08:25:00 -0700
commit73441c665bee555526b1cf3eef603a0cff0b7e19 (patch)
treedcf491e57d8b150527d09503182fd2aa398fd733 /fs
parentd5a92dd43739f59f77247cfbcbefd229e2948131 (diff)
parent8f6cff98477edbcd8ae4976734ba7edd07bdd244 (diff)
downloadlinux-73441c665bee555526b1cf3eef603a0cff0b7e19.tar.bz2
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.c4
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)
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;