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/nfs | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/Makefile | 13 | ||||
| -rw-r--r-- | fs/nfs/file.c | 4 | ||||
| -rw-r--r-- | fs/nfs/read.c | 2 | ||||
| -rw-r--r-- | fs/nfs/write.c | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile index 52283d234..45fa64168 100644 --- a/fs/nfs/Makefile +++ b/fs/nfs/Makefile @@ -8,16 +8,13 @@ # Note 2! The CFLAGS definitions are now in the main makefile. O_TARGET := nfs.o -O_OBJS := inode.o file.o read.o write.o dir.o symlink.o proc.o \ + +obj-y := inode.o file.o read.o write.o dir.o symlink.o proc.o \ nfs2xdr.o flushd.o unlink.o -ifdef CONFIG_ROOT_NFS - O_OBJS += nfsroot.o mount_clnt.o -endif -ifdef CONFIG_NFS_V3 - O_OBJS += nfs3proc.o nfs3xdr.o -endif +obj-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o +obj-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o -M_OBJS := $(O_TARGET) +obj-m := $(O_TARGET) include $(TOPDIR)/Rules.make diff --git a/fs/nfs/file.c b/fs/nfs/file.c index d5c92ba3b..2b3f22777 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -161,7 +161,7 @@ static int nfs_commit_write(struct file *file, struct page *page, unsigned offse { long status; loff_t pos = ((loff_t)page->index<<PAGE_CACHE_SHIFT) + to; - struct inode *inode = (struct inode*)page->mapping->host; + struct inode *inode = page->mapping->host; kunmap(page); lock_kernel(); @@ -188,7 +188,7 @@ static int nfs_sync_page(struct page *page) mapping = page->mapping; if (!mapping) return 0; - inode = (struct inode *)mapping->host; + inode = mapping->host; if (!inode) return 0; diff --git a/fs/nfs/read.c b/fs/nfs/read.c index e0f7313be..211d3a3db 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -479,7 +479,7 @@ nfs_readpage(struct file *file, struct page *page) struct address_space *mapping = page->mapping; if (!mapping) BUG(); - inode = (struct inode *)mapping->host; + inode = mapping->host; } else inode = file->f_dentry->d_inode; if (!inode) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index f75190be5..8b9a28556 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -263,7 +263,7 @@ nfs_writepage(struct page *page) if (!mapping) BUG(); - inode = (struct inode *)mapping->host; + inode = mapping->host; if (!inode) BUG(); end_index = inode->i_size >> PAGE_CACHE_SHIFT; |