diff options
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/Kbuild | 5 | ||||
| -rw-r--r-- | include/linux/nfsd/cld.h | 56 | ||||
| -rw-r--r-- | include/linux/nfsd/debug.h | 31 | ||||
| -rw-r--r-- | include/linux/nfsd/export.h | 52 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 111 | ||||
| -rw-r--r-- | include/linux/nfsd/stats.h | 8 |
6 files changed, 4 insertions, 259 deletions
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild index 5b7d84ac954a..e69de29bb2d1 100644 --- a/include/linux/nfsd/Kbuild +++ b/include/linux/nfsd/Kbuild | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | header-y += cld.h | ||
| 2 | header-y += debug.h | ||
| 3 | header-y += export.h | ||
| 4 | header-y += nfsfh.h | ||
| 5 | header-y += stats.h | ||
diff --git a/include/linux/nfsd/cld.h b/include/linux/nfsd/cld.h deleted file mode 100644 index f14a9ab06f1f..000000000000 --- a/include/linux/nfsd/cld.h +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Upcall description for nfsdcld communication | ||
| 3 | * | ||
| 4 | * Copyright (c) 2012 Red Hat, Inc. | ||
| 5 | * Author(s): Jeff Layton <jlayton@redhat.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 20 | */ | ||
| 21 | |||
| 22 | #ifndef _NFSD_CLD_H | ||
| 23 | #define _NFSD_CLD_H | ||
| 24 | |||
| 25 | /* latest upcall version available */ | ||
| 26 | #define CLD_UPCALL_VERSION 1 | ||
| 27 | |||
| 28 | /* defined by RFC3530 */ | ||
| 29 | #define NFS4_OPAQUE_LIMIT 1024 | ||
| 30 | |||
| 31 | enum cld_command { | ||
| 32 | Cld_Create, /* create a record for this cm_id */ | ||
| 33 | Cld_Remove, /* remove record of this cm_id */ | ||
| 34 | Cld_Check, /* is this cm_id allowed? */ | ||
| 35 | Cld_GraceDone, /* grace period is complete */ | ||
| 36 | }; | ||
| 37 | |||
| 38 | /* representation of long-form NFSv4 client ID */ | ||
| 39 | struct cld_name { | ||
| 40 | uint16_t cn_len; /* length of cm_id */ | ||
| 41 | unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */ | ||
| 42 | } __attribute__((packed)); | ||
| 43 | |||
| 44 | /* message struct for communication with userspace */ | ||
| 45 | struct cld_msg { | ||
| 46 | uint8_t cm_vers; /* upcall version */ | ||
| 47 | uint8_t cm_cmd; /* upcall command */ | ||
| 48 | int16_t cm_status; /* return code */ | ||
| 49 | uint32_t cm_xid; /* transaction id */ | ||
| 50 | union { | ||
| 51 | int64_t cm_gracetime; /* grace period start time */ | ||
| 52 | struct cld_name cm_name; | ||
| 53 | } __attribute__((packed)) cm_u; | ||
| 54 | } __attribute__((packed)); | ||
| 55 | |||
| 56 | #endif /* !_NFSD_CLD_H */ | ||
diff --git a/include/linux/nfsd/debug.h b/include/linux/nfsd/debug.h index ee4aa91788e7..19ef8375b577 100644 --- a/include/linux/nfsd/debug.h +++ b/include/linux/nfsd/debug.h | |||
| @@ -5,44 +5,15 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | |||
| 9 | #ifndef LINUX_NFSD_DEBUG_H | 8 | #ifndef LINUX_NFSD_DEBUG_H |
| 10 | #define LINUX_NFSD_DEBUG_H | 9 | #define LINUX_NFSD_DEBUG_H |
| 11 | 10 | ||
| 12 | #include <linux/sunrpc/debug.h> | 11 | #include <uapi/linux/nfsd/debug.h> |
| 13 | 12 | ||
| 14 | /* | ||
| 15 | * Enable debugging for nfsd. | ||
| 16 | * Requires RPC_DEBUG. | ||
| 17 | */ | ||
| 18 | #ifdef RPC_DEBUG | ||
| 19 | # define NFSD_DEBUG 1 | ||
| 20 | #endif | ||
| 21 | |||
| 22 | /* | ||
| 23 | * knfsd debug flags | ||
| 24 | */ | ||
| 25 | #define NFSDDBG_SOCK 0x0001 | ||
| 26 | #define NFSDDBG_FH 0x0002 | ||
| 27 | #define NFSDDBG_EXPORT 0x0004 | ||
| 28 | #define NFSDDBG_SVC 0x0008 | ||
| 29 | #define NFSDDBG_PROC 0x0010 | ||
| 30 | #define NFSDDBG_FILEOP 0x0020 | ||
| 31 | #define NFSDDBG_AUTH 0x0040 | ||
| 32 | #define NFSDDBG_REPCACHE 0x0080 | ||
| 33 | #define NFSDDBG_XDR 0x0100 | ||
| 34 | #define NFSDDBG_LOCKD 0x0200 | ||
| 35 | #define NFSDDBG_ALL 0x7FFF | ||
| 36 | #define NFSDDBG_NOCHANGE 0xFFFF | ||
| 37 | |||
| 38 | |||
| 39 | #ifdef __KERNEL__ | ||
| 40 | # undef ifdebug | 13 | # undef ifdebug |
| 41 | # ifdef NFSD_DEBUG | 14 | # ifdef NFSD_DEBUG |
| 42 | # define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag) | 15 | # define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag) |
| 43 | # else | 16 | # else |
| 44 | # define ifdebug(flag) if (0) | 17 | # define ifdebug(flag) if (0) |
| 45 | # endif | 18 | # endif |
| 46 | #endif /* __KERNEL__ */ | ||
| 47 | |||
| 48 | #endif /* LINUX_NFSD_DEBUG_H */ | 19 | #endif /* LINUX_NFSD_DEBUG_H */ |
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index e33f747b173c..24c139288db4 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
| @@ -6,58 +6,11 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> | 7 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> |
| 8 | */ | 8 | */ |
| 9 | |||
| 10 | #ifndef NFSD_EXPORT_H | 9 | #ifndef NFSD_EXPORT_H |
| 11 | #define NFSD_EXPORT_H | 10 | #define NFSD_EXPORT_H |
| 12 | 11 | ||
| 13 | # include <linux/types.h> | ||
| 14 | #ifdef __KERNEL__ | ||
| 15 | # include <linux/nfsd/nfsfh.h> | 12 | # include <linux/nfsd/nfsfh.h> |
| 16 | #endif | 13 | #include <uapi/linux/nfsd/export.h> |
| 17 | |||
| 18 | /* | ||
| 19 | * Important limits for the exports stuff. | ||
| 20 | */ | ||
| 21 | #define NFSCLNT_IDMAX 1024 | ||
| 22 | #define NFSCLNT_ADDRMAX 16 | ||
| 23 | #define NFSCLNT_KEYMAX 32 | ||
| 24 | |||
| 25 | /* | ||
| 26 | * Export flags. | ||
| 27 | */ | ||
| 28 | #define NFSEXP_READONLY 0x0001 | ||
| 29 | #define NFSEXP_INSECURE_PORT 0x0002 | ||
| 30 | #define NFSEXP_ROOTSQUASH 0x0004 | ||
| 31 | #define NFSEXP_ALLSQUASH 0x0008 | ||
| 32 | #define NFSEXP_ASYNC 0x0010 | ||
| 33 | #define NFSEXP_GATHERED_WRITES 0x0020 | ||
| 34 | /* 40 80 100 currently unused */ | ||
| 35 | #define NFSEXP_NOHIDE 0x0200 | ||
| 36 | #define NFSEXP_NOSUBTREECHECK 0x0400 | ||
| 37 | #define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */ | ||
| 38 | #define NFSEXP_MSNFS 0x1000 /* do silly things that MS clients expect; no longer supported */ | ||
| 39 | #define NFSEXP_FSID 0x2000 | ||
| 40 | #define NFSEXP_CROSSMOUNT 0x4000 | ||
| 41 | #define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */ | ||
| 42 | /* | ||
| 43 | * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4 | ||
| 44 | * clients, and only to the single directory that is the root of the | ||
| 45 | * export; further lookup and readdir operations are treated as if every | ||
| 46 | * subdirectory was a mountpoint, and ignored if they are not themselves | ||
| 47 | * exported. This is used by nfsd and mountd to construct the NFSv4 | ||
| 48 | * pseudofilesystem, which provides access only to paths leading to each | ||
| 49 | * exported filesystem. | ||
| 50 | */ | ||
| 51 | #define NFSEXP_V4ROOT 0x10000 | ||
| 52 | /* All flags that we claim to support. (Note we don't support NOACL.) */ | ||
| 53 | #define NFSEXP_ALLFLAGS 0x17E3F | ||
| 54 | |||
| 55 | /* The flags that may vary depending on security flavor: */ | ||
| 56 | #define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \ | ||
| 57 | | NFSEXP_ALLSQUASH \ | ||
| 58 | | NFSEXP_INSECURE_PORT) | ||
| 59 | |||
| 60 | #ifdef __KERNEL__ | ||
| 61 | 14 | ||
| 62 | /* | 15 | /* |
| 63 | * FS Locations | 16 | * FS Locations |
| @@ -154,7 +107,4 @@ static inline void exp_get(struct svc_export *exp) | |||
| 154 | } | 107 | } |
| 155 | struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *); | 108 | struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *); |
| 156 | 109 | ||
| 157 | #endif /* __KERNEL__ */ | ||
| 158 | |||
| 159 | #endif /* NFSD_EXPORT_H */ | 110 | #endif /* NFSD_EXPORT_H */ |
| 160 | |||
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index fa63048fecff..a93593f1fa4e 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -10,117 +10,11 @@ | |||
| 10 | * | 10 | * |
| 11 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> | 11 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> |
| 12 | */ | 12 | */ |
| 13 | |||
| 14 | #ifndef _LINUX_NFSD_FH_H | 13 | #ifndef _LINUX_NFSD_FH_H |
| 15 | #define _LINUX_NFSD_FH_H | 14 | #define _LINUX_NFSD_FH_H |
| 16 | 15 | ||
| 17 | #include <linux/types.h> | ||
| 18 | #include <linux/nfs.h> | ||
| 19 | #include <linux/nfs2.h> | ||
| 20 | #include <linux/nfs3.h> | ||
| 21 | #include <linux/nfs4.h> | ||
| 22 | #ifdef __KERNEL__ | ||
| 23 | # include <linux/sunrpc/svc.h> | 16 | # include <linux/sunrpc/svc.h> |
| 24 | #endif | 17 | #include <uapi/linux/nfsd/nfsfh.h> |
| 25 | |||
| 26 | /* | ||
| 27 | * This is the old "dentry style" Linux NFSv2 file handle. | ||
| 28 | * | ||
| 29 | * The xino and xdev fields are currently used to transport the | ||
| 30 | * ino/dev of the exported inode. | ||
| 31 | */ | ||
| 32 | struct nfs_fhbase_old { | ||
| 33 | __u32 fb_dcookie; /* dentry cookie - always 0xfeebbaca */ | ||
| 34 | __u32 fb_ino; /* our inode number */ | ||
| 35 | __u32 fb_dirino; /* dir inode number, 0 for directories */ | ||
| 36 | __u32 fb_dev; /* our device */ | ||
| 37 | __u32 fb_xdev; | ||
| 38 | __u32 fb_xino; | ||
| 39 | __u32 fb_generation; | ||
| 40 | }; | ||
| 41 | |||
| 42 | /* | ||
| 43 | * This is the new flexible, extensible style NFSv2/v3 file handle. | ||
| 44 | * by Neil Brown <neilb@cse.unsw.edu.au> - March 2000 | ||
| 45 | * | ||
| 46 | * The file handle starts with a sequence of four-byte words. | ||
| 47 | * The first word contains a version number (1) and three descriptor bytes | ||
| 48 | * that tell how the remaining 3 variable length fields should be handled. | ||
| 49 | * These three bytes are auth_type, fsid_type and fileid_type. | ||
| 50 | * | ||
| 51 | * All four-byte values are in host-byte-order. | ||
| 52 | * | ||
| 53 | * The auth_type field specifies how the filehandle can be authenticated | ||
| 54 | * This might allow a file to be confirmed to be in a writable part of a | ||
| 55 | * filetree without checking the path from it up to the root. | ||
| 56 | * Current values: | ||
| 57 | * 0 - No authentication. fb_auth is 0 bytes long | ||
| 58 | * Possible future values: | ||
| 59 | * 1 - 4 bytes taken from MD5 hash of the remainer of the file handle | ||
| 60 | * prefixed by a secret and with the important export flags. | ||
| 61 | * | ||
| 62 | * The fsid_type identifies how the filesystem (or export point) is | ||
| 63 | * encoded. | ||
| 64 | * Current values: | ||
| 65 | * 0 - 4 byte device id (ms-2-bytes major, ls-2-bytes minor), 4byte inode number | ||
| 66 | * NOTE: we cannot use the kdev_t device id value, because kdev_t.h | ||
| 67 | * says we mustn't. We must break it up and reassemble. | ||
| 68 | * 1 - 4 byte user specified identifier | ||
| 69 | * 2 - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED | ||
| 70 | * 3 - 4 byte device id, encoded for user-space, 4 byte inode number | ||
| 71 | * 4 - 4 byte inode number and 4 byte uuid | ||
| 72 | * 5 - 8 byte uuid | ||
| 73 | * 6 - 16 byte uuid | ||
| 74 | * 7 - 8 byte inode number and 16 byte uuid | ||
| 75 | * | ||
| 76 | * The fileid_type identified how the file within the filesystem is encoded. | ||
| 77 | * This is (will be) passed to, and set by, the underlying filesystem if it supports | ||
| 78 | * filehandle operations. The filesystem must not use the value '0' or '0xff' and may | ||
| 79 | * only use the values 1 and 2 as defined below: | ||
| 80 | * Current values: | ||
| 81 | * 0 - The root, or export point, of the filesystem. fb_fileid is 0 bytes. | ||
| 82 | * 1 - 32bit inode number, 32 bit generation number. | ||
| 83 | * 2 - 32bit inode number, 32 bit generation number, 32 bit parent directory inode number. | ||
| 84 | * | ||
| 85 | */ | ||
| 86 | struct nfs_fhbase_new { | ||
| 87 | __u8 fb_version; /* == 1, even => nfs_fhbase_old */ | ||
| 88 | __u8 fb_auth_type; | ||
| 89 | __u8 fb_fsid_type; | ||
| 90 | __u8 fb_fileid_type; | ||
| 91 | __u32 fb_auth[1]; | ||
| 92 | /* __u32 fb_fsid[0]; floating */ | ||
| 93 | /* __u32 fb_fileid[0]; floating */ | ||
| 94 | }; | ||
| 95 | |||
| 96 | struct knfsd_fh { | ||
| 97 | unsigned int fh_size; /* significant for NFSv3. | ||
| 98 | * Points to the current size while building | ||
| 99 | * a new file handle | ||
| 100 | */ | ||
| 101 | union { | ||
| 102 | struct nfs_fhbase_old fh_old; | ||
| 103 | __u32 fh_pad[NFS4_FHSIZE/4]; | ||
| 104 | struct nfs_fhbase_new fh_new; | ||
| 105 | } fh_base; | ||
| 106 | }; | ||
| 107 | |||
| 108 | #define ofh_dcookie fh_base.fh_old.fb_dcookie | ||
| 109 | #define ofh_ino fh_base.fh_old.fb_ino | ||
| 110 | #define ofh_dirino fh_base.fh_old.fb_dirino | ||
| 111 | #define ofh_dev fh_base.fh_old.fb_dev | ||
| 112 | #define ofh_xdev fh_base.fh_old.fb_xdev | ||
| 113 | #define ofh_xino fh_base.fh_old.fb_xino | ||
| 114 | #define ofh_generation fh_base.fh_old.fb_generation | ||
| 115 | |||
| 116 | #define fh_version fh_base.fh_new.fb_version | ||
| 117 | #define fh_fsid_type fh_base.fh_new.fb_fsid_type | ||
| 118 | #define fh_auth_type fh_base.fh_new.fb_auth_type | ||
| 119 | #define fh_fileid_type fh_base.fh_new.fb_fileid_type | ||
| 120 | #define fh_auth fh_base.fh_new.fb_auth | ||
| 121 | #define fh_fsid fh_base.fh_new.fb_auth | ||
| 122 | |||
| 123 | #ifdef __KERNEL__ | ||
| 124 | 18 | ||
| 125 | static inline __u32 ino_t_to_u32(ino_t ino) | 19 | static inline __u32 ino_t_to_u32(ino_t ino) |
| 126 | { | 20 | { |
| @@ -166,7 +60,4 @@ typedef struct svc_fh { | |||
| 166 | 60 | ||
| 167 | } svc_fh; | 61 | } svc_fh; |
| 168 | 62 | ||
| 169 | #endif /* __KERNEL__ */ | ||
| 170 | |||
| 171 | |||
| 172 | #endif /* _LINUX_NFSD_FH_H */ | 63 | #endif /* _LINUX_NFSD_FH_H */ |
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h index 2693ef647df6..e75b2544ff12 100644 --- a/include/linux/nfsd/stats.h +++ b/include/linux/nfsd/stats.h | |||
| @@ -5,16 +5,11 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | |||
| 9 | #ifndef LINUX_NFSD_STATS_H | 8 | #ifndef LINUX_NFSD_STATS_H |
| 10 | #define LINUX_NFSD_STATS_H | 9 | #define LINUX_NFSD_STATS_H |
| 11 | 10 | ||
| 12 | #include <linux/nfs4.h> | 11 | #include <uapi/linux/nfsd/stats.h> |
| 13 | |||
| 14 | /* thread usage wraps very million seconds (approx one fortnight) */ | ||
| 15 | #define NFSD_USAGE_WRAP (HZ*1000000) | ||
| 16 | 12 | ||
| 17 | #ifdef __KERNEL__ | ||
| 18 | 13 | ||
| 19 | struct nfsd_stats { | 14 | struct nfsd_stats { |
| 20 | unsigned int rchits; /* repcache hits */ | 15 | unsigned int rchits; /* repcache hits */ |
| @@ -47,5 +42,4 @@ extern struct svc_stat nfsd_svcstats; | |||
| 47 | void nfsd_stat_init(void); | 42 | void nfsd_stat_init(void); |
| 48 | void nfsd_stat_shutdown(void); | 43 | void nfsd_stat_shutdown(void); |
| 49 | 44 | ||
| 50 | #endif /* __KERNEL__ */ | ||
| 51 | #endif /* LINUX_NFSD_STATS_H */ | 45 | #endif /* LINUX_NFSD_STATS_H */ |
