diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/linux/nfsd | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/debug.h | 19 | ||||
| -rw-r--r-- | include/linux/nfsd/export.h | 110 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 63 | ||||
| -rw-r--r-- | include/linux/nfsd/stats.h | 45 |
4 files changed, 0 insertions, 237 deletions
diff --git a/include/linux/nfsd/debug.h b/include/linux/nfsd/debug.h deleted file mode 100644 index 19ef8375b577..000000000000 --- a/include/linux/nfsd/debug.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/linux/nfsd/debug.h | ||
| 3 | * | ||
| 4 | * Debugging-related stuff for nfsd | ||
| 5 | * | ||
| 6 | * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de> | ||
| 7 | */ | ||
| 8 | #ifndef LINUX_NFSD_DEBUG_H | ||
| 9 | #define LINUX_NFSD_DEBUG_H | ||
| 10 | |||
| 11 | #include <uapi/linux/nfsd/debug.h> | ||
| 12 | |||
| 13 | # undef ifdebug | ||
| 14 | # ifdef NFSD_DEBUG | ||
| 15 | # define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag) | ||
| 16 | # else | ||
| 17 | # define ifdebug(flag) if (0) | ||
| 18 | # endif | ||
| 19 | #endif /* LINUX_NFSD_DEBUG_H */ | ||
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h deleted file mode 100644 index 7898c997dfea..000000000000 --- a/include/linux/nfsd/export.h +++ /dev/null | |||
| @@ -1,110 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * include/linux/nfsd/export.h | ||
| 3 | * | ||
| 4 | * Public declarations for NFS exports. The definitions for the | ||
| 5 | * syscall interface are in nfsctl.h | ||
| 6 | * | ||
| 7 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> | ||
| 8 | */ | ||
| 9 | #ifndef NFSD_EXPORT_H | ||
| 10 | #define NFSD_EXPORT_H | ||
| 11 | |||
| 12 | # include <linux/nfsd/nfsfh.h> | ||
| 13 | #include <uapi/linux/nfsd/export.h> | ||
| 14 | |||
| 15 | /* | ||
| 16 | * FS Locations | ||
| 17 | */ | ||
| 18 | |||
| 19 | #define MAX_FS_LOCATIONS 128 | ||
| 20 | |||
| 21 | struct nfsd4_fs_location { | ||
| 22 | char *hosts; /* colon separated list of hosts */ | ||
| 23 | char *path; /* slash separated list of path components */ | ||
| 24 | }; | ||
| 25 | |||
| 26 | struct nfsd4_fs_locations { | ||
| 27 | uint32_t locations_count; | ||
| 28 | struct nfsd4_fs_location *locations; | ||
| 29 | /* If we're not actually serving this data ourselves (only providing a | ||
| 30 | * list of replicas that do serve it) then we set "migrated": */ | ||
| 31 | int migrated; | ||
| 32 | }; | ||
| 33 | |||
| 34 | /* | ||
| 35 | * We keep an array of pseudoflavors with the export, in order from most | ||
| 36 | * to least preferred. For the foreseeable future, we don't expect more | ||
| 37 | * than the eight pseudoflavors null, unix, krb5, krb5i, krb5p, skpm3, | ||
| 38 | * spkm3i, and spkm3p (and using all 8 at once should be rare). | ||
| 39 | */ | ||
| 40 | #define MAX_SECINFO_LIST 8 | ||
| 41 | |||
| 42 | struct exp_flavor_info { | ||
| 43 | u32 pseudoflavor; | ||
| 44 | u32 flags; | ||
| 45 | }; | ||
| 46 | |||
| 47 | struct svc_export { | ||
| 48 | struct cache_head h; | ||
| 49 | struct auth_domain * ex_client; | ||
| 50 | int ex_flags; | ||
| 51 | struct path ex_path; | ||
| 52 | kuid_t ex_anon_uid; | ||
| 53 | kgid_t ex_anon_gid; | ||
| 54 | int ex_fsid; | ||
| 55 | unsigned char * ex_uuid; /* 16 byte fsid */ | ||
| 56 | struct nfsd4_fs_locations ex_fslocs; | ||
| 57 | int ex_nflavors; | ||
| 58 | struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST]; | ||
| 59 | struct cache_detail *cd; | ||
| 60 | }; | ||
| 61 | |||
| 62 | /* an "export key" (expkey) maps a filehandlefragement to an | ||
| 63 | * svc_export for a given client. There can be several per export, | ||
| 64 | * for the different fsid types. | ||
| 65 | */ | ||
| 66 | struct svc_expkey { | ||
| 67 | struct cache_head h; | ||
| 68 | |||
| 69 | struct auth_domain * ek_client; | ||
| 70 | int ek_fsidtype; | ||
| 71 | u32 ek_fsid[6]; | ||
| 72 | |||
| 73 | struct path ek_path; | ||
| 74 | }; | ||
| 75 | |||
| 76 | #define EX_ISSYNC(exp) (!((exp)->ex_flags & NFSEXP_ASYNC)) | ||
| 77 | #define EX_NOHIDE(exp) ((exp)->ex_flags & NFSEXP_NOHIDE) | ||
| 78 | #define EX_WGATHER(exp) ((exp)->ex_flags & NFSEXP_GATHERED_WRITES) | ||
| 79 | |||
| 80 | int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp); | ||
| 81 | __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp); | ||
| 82 | |||
| 83 | /* | ||
| 84 | * Function declarations | ||
| 85 | */ | ||
| 86 | int nfsd_export_init(struct net *); | ||
| 87 | void nfsd_export_shutdown(struct net *); | ||
| 88 | void nfsd_export_flush(struct net *); | ||
| 89 | struct svc_export * rqst_exp_get_by_name(struct svc_rqst *, | ||
| 90 | struct path *); | ||
| 91 | struct svc_export * rqst_exp_parent(struct svc_rqst *, | ||
| 92 | struct path *); | ||
| 93 | struct svc_export * rqst_find_fsidzero_export(struct svc_rqst *); | ||
| 94 | int exp_rootfh(struct net *, struct auth_domain *, | ||
| 95 | char *path, struct knfsd_fh *, int maxsize); | ||
| 96 | __be32 exp_pseudoroot(struct svc_rqst *, struct svc_fh *); | ||
| 97 | __be32 nfserrno(int errno); | ||
| 98 | |||
| 99 | static inline void exp_put(struct svc_export *exp) | ||
| 100 | { | ||
| 101 | cache_put(&exp->h, exp->cd); | ||
| 102 | } | ||
| 103 | |||
| 104 | static inline void exp_get(struct svc_export *exp) | ||
| 105 | { | ||
| 106 | cache_get(&exp->h); | ||
| 107 | } | ||
| 108 | struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *); | ||
| 109 | |||
| 110 | #endif /* NFSD_EXPORT_H */ | ||
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h deleted file mode 100644 index a93593f1fa4e..000000000000 --- a/include/linux/nfsd/nfsfh.h +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * include/linux/nfsd/nfsfh.h | ||
| 3 | * | ||
| 4 | * This file describes the layout of the file handles as passed | ||
| 5 | * over the wire. | ||
| 6 | * | ||
| 7 | * Earlier versions of knfsd used to sign file handles using keyed MD5 | ||
| 8 | * or SHA. I've removed this code, because it doesn't give you more | ||
| 9 | * security than blocking external access to port 2049 on your firewall. | ||
| 10 | * | ||
| 11 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> | ||
| 12 | */ | ||
| 13 | #ifndef _LINUX_NFSD_FH_H | ||
| 14 | #define _LINUX_NFSD_FH_H | ||
| 15 | |||
| 16 | # include <linux/sunrpc/svc.h> | ||
| 17 | #include <uapi/linux/nfsd/nfsfh.h> | ||
| 18 | |||
| 19 | static inline __u32 ino_t_to_u32(ino_t ino) | ||
| 20 | { | ||
| 21 | return (__u32) ino; | ||
| 22 | } | ||
| 23 | |||
| 24 | static inline ino_t u32_to_ino_t(__u32 uino) | ||
| 25 | { | ||
| 26 | return (ino_t) uino; | ||
| 27 | } | ||
| 28 | |||
| 29 | /* | ||
| 30 | * This is the internal representation of an NFS handle used in knfsd. | ||
| 31 | * pre_mtime/post_version will be used to support wcc_attr's in NFSv3. | ||
| 32 | */ | ||
| 33 | typedef struct svc_fh { | ||
| 34 | struct knfsd_fh fh_handle; /* FH data */ | ||
| 35 | struct dentry * fh_dentry; /* validated dentry */ | ||
| 36 | struct svc_export * fh_export; /* export pointer */ | ||
| 37 | int fh_maxsize; /* max size for fh_handle */ | ||
| 38 | |||
| 39 | unsigned char fh_locked; /* inode locked by us */ | ||
| 40 | unsigned char fh_want_write; /* remount protection taken */ | ||
| 41 | |||
| 42 | #ifdef CONFIG_NFSD_V3 | ||
| 43 | unsigned char fh_post_saved; /* post-op attrs saved */ | ||
| 44 | unsigned char fh_pre_saved; /* pre-op attrs saved */ | ||
| 45 | |||
| 46 | /* Pre-op attributes saved during fh_lock */ | ||
| 47 | __u64 fh_pre_size; /* size before operation */ | ||
| 48 | struct timespec fh_pre_mtime; /* mtime before oper */ | ||
| 49 | struct timespec fh_pre_ctime; /* ctime before oper */ | ||
| 50 | /* | ||
| 51 | * pre-op nfsv4 change attr: note must check IS_I_VERSION(inode) | ||
| 52 | * to find out if it is valid. | ||
| 53 | */ | ||
| 54 | u64 fh_pre_change; | ||
| 55 | |||
| 56 | /* Post-op attributes saved in fh_unlock */ | ||
| 57 | struct kstat fh_post_attr; /* full attrs after operation */ | ||
| 58 | u64 fh_post_change; /* nfsv4 change; see above */ | ||
| 59 | #endif /* CONFIG_NFSD_V3 */ | ||
| 60 | |||
| 61 | } svc_fh; | ||
| 62 | |||
| 63 | #endif /* _LINUX_NFSD_FH_H */ | ||
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h deleted file mode 100644 index e75b2544ff12..000000000000 --- a/include/linux/nfsd/stats.h +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/linux/nfsd/stats.h | ||
| 3 | * | ||
| 4 | * Statistics for NFS server. | ||
| 5 | * | ||
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | ||
| 7 | */ | ||
| 8 | #ifndef LINUX_NFSD_STATS_H | ||
| 9 | #define LINUX_NFSD_STATS_H | ||
| 10 | |||
| 11 | #include <uapi/linux/nfsd/stats.h> | ||
| 12 | |||
| 13 | |||
| 14 | struct nfsd_stats { | ||
| 15 | unsigned int rchits; /* repcache hits */ | ||
| 16 | unsigned int rcmisses; /* repcache hits */ | ||
| 17 | unsigned int rcnocache; /* uncached reqs */ | ||
| 18 | unsigned int fh_stale; /* FH stale error */ | ||
| 19 | unsigned int fh_lookup; /* dentry cached */ | ||
| 20 | unsigned int fh_anon; /* anon file dentry returned */ | ||
| 21 | unsigned int fh_nocache_dir; /* filehandle not found in dcache */ | ||
| 22 | unsigned int fh_nocache_nondir; /* filehandle not found in dcache */ | ||
| 23 | unsigned int io_read; /* bytes returned to read requests */ | ||
| 24 | unsigned int io_write; /* bytes passed in write requests */ | ||
| 25 | unsigned int th_cnt; /* number of available threads */ | ||
| 26 | unsigned int th_usage[10]; /* number of ticks during which n perdeciles | ||
| 27 | * of available threads were in use */ | ||
| 28 | unsigned int th_fullcnt; /* number of times last free thread was used */ | ||
| 29 | unsigned int ra_size; /* size of ra cache */ | ||
| 30 | unsigned int ra_depth[11]; /* number of times ra entry was found that deep | ||
| 31 | * in the cache (10percentiles). [10] = not found */ | ||
| 32 | #ifdef CONFIG_NFSD_V4 | ||
| 33 | unsigned int nfs4_opcount[LAST_NFS4_OP + 1]; /* count of individual nfsv4 operations */ | ||
| 34 | #endif | ||
| 35 | |||
| 36 | }; | ||
| 37 | |||
| 38 | |||
| 39 | extern struct nfsd_stats nfsdstats; | ||
| 40 | extern struct svc_stat nfsd_svcstats; | ||
| 41 | |||
| 42 | void nfsd_stat_init(void); | ||
| 43 | void nfsd_stat_shutdown(void); | ||
| 44 | |||
| 45 | #endif /* LINUX_NFSD_STATS_H */ | ||
