diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /fs/nfs/proc.c | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'fs/nfs/proc.c')
| -rw-r--r-- | fs/nfs/proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index 3b48b326a..bb55ce6d6 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -65,7 +65,7 @@ nfs_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, int nfs_proc_setattr(struct nfs_server *server, struct nfs_fh *fhandle, - struct nfs_sattr *sattr, struct nfs_fattr *fattr) + struct nfs_fattr *fattr, struct iattr *sattr) { struct nfs_sattrargs arg = { fhandle, sattr }; int status; @@ -123,7 +123,7 @@ nfs_proc_write(struct nfs_server *server, struct nfs_fh *fhandle, int swap, int nfs_proc_create(struct nfs_server *server, struct nfs_fh *dir, - const char *name, struct nfs_sattr *sattr, + const char *name, struct iattr *sattr, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { struct nfs_createargs arg = { dir, name, sattr }; @@ -178,7 +178,7 @@ nfs_proc_link(struct nfs_server *server, struct nfs_fh *fhandle, int nfs_proc_symlink(struct nfs_server *server, struct nfs_fh *dir, const char *name, const char *path, - struct nfs_sattr *sattr) + struct iattr *sattr) { struct nfs_symlinkargs arg = { dir, name, path, sattr }; int status; @@ -191,7 +191,7 @@ nfs_proc_symlink(struct nfs_server *server, struct nfs_fh *dir, int nfs_proc_mkdir(struct nfs_server *server, struct nfs_fh *dir, - const char *name, struct nfs_sattr *sattr, + const char *name, struct iattr *sattr, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { struct nfs_createargs arg = { dir, name, sattr }; |