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 /include/linux/nfs.h | |
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 'include/linux/nfs.h')
-rw-r--r-- | include/linux/nfs.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/linux/nfs.h b/include/linux/nfs.h index 4f7d3230e..c188fc808 100644 --- a/include/linux/nfs.h +++ b/include/linux/nfs.h @@ -122,15 +122,6 @@ struct nfs_fattr { struct nfs_time ctime; }; -struct nfs_sattr { - __u32 mode; - __u32 uid; - __u32 gid; - __u32 size; - struct nfs_time atime; - struct nfs_time mtime; -}; - struct nfs_fsinfo { __u32 tsize; __u32 bsize; @@ -150,7 +141,7 @@ struct nfs_writeargs { struct nfs_sattrargs { struct nfs_fh * fh; - struct nfs_sattr * sattr; + struct iattr * sattr; }; struct nfs_diropargs { @@ -173,7 +164,7 @@ struct nfs_readargs { struct nfs_createargs { struct nfs_fh * fh; const char * name; - struct nfs_sattr * sattr; + struct iattr * sattr; }; struct nfs_renameargs { @@ -193,7 +184,7 @@ struct nfs_symlinkargs { struct nfs_fh * fromfh; const char * fromname; const char * topath; - struct nfs_sattr * sattr; + struct iattr * sattr; }; struct nfs_readdirargs { |