diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /include/linux/nfsd | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/stats.h | 13 | ||||
| -rw-r--r-- | include/linux/nfsd/syscall.h | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h index 4169a1e21..3523a6daa 100644 --- a/include/linux/nfsd/stats.h +++ b/include/linux/nfsd/stats.h @@ -16,8 +16,17 @@ struct nfsd_stats { unsigned int fh_stale; /* FH stale error */ unsigned int fh_lookup; /* dentry cached */ unsigned int fh_anon; /* anon file dentry returned */ - unsigned int fh_nocache_dir; /* filehandle not foudn in dcache */ - unsigned int fh_nocache_nondir; /* filehandle not foudn in dcache */ + unsigned int fh_nocache_dir; /* filehandle not found in dcache */ + unsigned int fh_nocache_nondir; /* filehandle not found in dcache */ + unsigned int io_read; /* bytes returned to read requests */ + unsigned int io_write; /* bytes passed in write requests */ + unsigned int th_cnt; /* number of available threads */ + unsigned int th_usage[10]; /* number of ticks during which n perdeciles + * of available threads were in use */ + unsigned int th_fullcnt; /* number of times last free thread was used */ + unsigned int ra_size; /* size of ra cache */ + unsigned int ra_depth[11]; /* number of times ra entry was found that deep + * in the cache (10percentiles). [10] = not found */ }; #ifdef __KERNEL__ diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index af723ced8..4f20ad01f 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h @@ -111,10 +111,7 @@ struct nfsctl_arg { struct nfsctl_uidmap u_umap; struct nfsctl_fhparm u_getfh; struct nfsctl_fdparm u_getfd; -#ifdef notyet struct nfsctl_fsparm u_getfs; -#endif - unsigned int u_debug; } u; #define ca_svc u.u_svc #define ca_client u.u_client @@ -124,15 +121,11 @@ struct nfsctl_arg { #define ca_getfd u.u_getfd #define ca_getfs u.u_getfs #define ca_authd u.u_authd -#define ca_debug u.u_debug }; union nfsctl_res { __u8 cr_getfh[NFS_FHSIZE]; -#ifdef notyet struct knfsd_fh cr_getfs; -#endif - unsigned int cr_debug; }; #ifdef __KERNEL__ |