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
This commit is contained in:
Коммит
73441c665b
|
@ -318,7 +318,7 @@ int diRead(struct inode *ip)
|
||||||
struct inomap *imap;
|
struct inomap *imap;
|
||||||
int block_offset;
|
int block_offset;
|
||||||
int inodes_left;
|
int inodes_left;
|
||||||
uint pageno;
|
unsigned long pageno;
|
||||||
int rel_inode;
|
int rel_inode;
|
||||||
|
|
||||||
jfs_info("diRead: ino = %ld", ip->i_ino);
|
jfs_info("diRead: ino = %ld", ip->i_ino);
|
||||||
|
@ -606,7 +606,7 @@ int diWrite(tid_t tid, struct inode *ip)
|
||||||
int block_offset;
|
int block_offset;
|
||||||
int inodes_left;
|
int inodes_left;
|
||||||
struct metapage *mp;
|
struct metapage *mp;
|
||||||
uint pageno;
|
unsigned long pageno;
|
||||||
int rel_inode;
|
int rel_inode;
|
||||||
int dioffset;
|
int dioffset;
|
||||||
struct inode *ipimap;
|
struct inode *ipimap;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче