diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /fs/cramfs | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'fs/cramfs')
| -rw-r--r-- | fs/cramfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index c5ca590d2..279b0bfef 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -303,9 +303,9 @@ static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry) return NULL; } -static int cramfs_readpage(struct dentry *dentry, struct page * page) +static int cramfs_readpage(struct file *file, struct page * page) { - struct inode *inode = dentry->d_inode; + struct inode *inode = (struct inode*)page->mapping->host; u32 maxblock, bytes_filled; maxblock = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |