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/affs | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/file.c | 4 | ||||
| -rw-r--r-- | fs/affs/symlink.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c index 251853a54..cd31491b0 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -338,11 +338,11 @@ abort_negative: } -static int affs_writepage(struct file *file, struct dentry *dentry, struct page *page) +static int affs_writepage(struct file *file, struct page *page) { return block_write_full_page(page,affs_get_block); } -static int affs_readpage(struct dentry *dentry, struct page *page) +static int affs_readpage(struct file *file, struct page *page) { return block_read_full_page(page,affs_get_block); } diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c index cd02b93dd..aee023ef5 100644 --- a/fs/affs/symlink.c +++ b/fs/affs/symlink.c @@ -15,10 +15,10 @@ #include <linux/amigaffs.h> #include <linux/pagemap.h> -static int affs_symlink_readpage(struct dentry *dentry, struct page *page) +static int affs_symlink_readpage(struct file *file, struct page *page) { struct buffer_head *bh; - struct inode *inode = dentry->d_inode; + struct inode *inode = (struct inode*)page->mapping->host; char *link = (char*)kmap(page); struct slink_front *lf; int err; |