diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /fs/affs | |
parent | 458fe58677afb17219d864e100131728038b4f1b (diff) |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'fs/affs')
-rw-r--r-- | fs/affs/dir.c | 4 | ||||
-rw-r--r-- | fs/affs/inode.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/affs/dir.c b/fs/affs/dir.c index 3fc8409b0..aba6b0baa 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c @@ -111,7 +111,7 @@ affs_readdir(struct file *filp, void *dirent, filldir_t filldir) * we can jump directly to where we left off. */ if (filp->private_data && filp->f_version == inode->i_version) { - i = (s32)filp->private_data; + i = (s32)(unsigned long)filp->private_data; j = 0; pr_debug("AFFS: readdir() left off=%d\n",i); } @@ -137,7 +137,7 @@ affs_readdir(struct file *filp, void *dirent, filldir_t filldir) filp->private_data = (void *)ino; if (filldir(dirent,name,namelen,filp->f_pos,ino) < 0) goto readdir_done; - filp->private_data = (void *)i; + filp->private_data = (void *)(unsigned long)i; affs_brelse(fh_bh); fh_bh = NULL; stored++; diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 1551e613c..84ea2adf8 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c @@ -191,7 +191,7 @@ affs_read_inode(struct inode *inode) } void -affs_write_inode(struct inode *inode) +affs_write_inode(struct inode *inode, int unused) { struct buffer_head *bh; struct file_end *file_end; |