diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /fs/hpfs | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/hpfs_fs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/hpfs/hpfs_fs.c b/fs/hpfs/hpfs_fs.c index 46ffcaed9..1d9117337 100644 --- a/fs/hpfs/hpfs_fs.c +++ b/fs/hpfs/hpfs_fs.c @@ -189,7 +189,7 @@ static const struct inode_operations hpfs_file_iops = static long hpfs_dir_read(struct inode *inode, struct file *filp, char *buf, unsigned long count); -static int hpfs_readdir(struct inode *inode, struct file *filp, +static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir); static int hpfs_lookup(struct inode *, struct dentry *); @@ -1362,7 +1362,7 @@ static void translate_hpfs_name(const unsigned char * from, int len, char * to, } } -static int hpfs_readdir(struct inode *inode, struct file *filp, void * dirent, +static int hpfs_readdir(struct file *filp, void * dirent, filldir_t filldir) { struct quad_buffer_head qbh; @@ -1371,6 +1371,7 @@ static int hpfs_readdir(struct inode *inode, struct file *filp, void * dirent, ino_t ino; char * tempname; long old_pos; + struct inode *inode = filp->f_dentry->d_inode; if (inode == 0 || inode->i_sb == 0 |