diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /fs/affs | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/Makefile | 5 | ||||
| -rw-r--r-- | fs/affs/file.c | 2 | ||||
| -rw-r--r-- | fs/affs/symlink.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/fs/affs/Makefile b/fs/affs/Makefile index c0def3c92..122c4be7b 100644 --- a/fs/affs/Makefile +++ b/fs/affs/Makefile @@ -8,7 +8,8 @@ # Note 2! The CFLAGS definitions are now in the main makefile. O_TARGET := affs.o -O_OBJS := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o -M_OBJS := $(O_TARGET) + +obj-y := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o +obj-m := $(O_TARGET) include $(TOPDIR)/Rules.make diff --git a/fs/affs/file.c b/fs/affs/file.c index 341660c4b..fac21f70b 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -349,7 +349,7 @@ static int affs_readpage(struct file *file, struct page *page) static int affs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { return cont_prepare_write(page,from,to,affs_get_block, - &((struct inode*)page->mapping->host)->u.affs_i.mmu_private); + &page->mapping->host->u.affs_i.mmu_private); } static int _affs_bmap(struct address_space *mapping, long block) { diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c index b125dee4e..78b7f147e 100644 --- a/fs/affs/symlink.c +++ b/fs/affs/symlink.c @@ -19,7 +19,7 @@ static int affs_symlink_readpage(struct file *file, struct page *page) { struct buffer_head *bh; - struct inode *inode = (struct inode*)page->mapping->host; + struct inode *inode = page->mapping->host; char *link = kmap(page); struct slink_front *lf; int err; |