d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some definitions for NFSv4.2 which will be used by subsequent commits.

Browse Source 
This is a preliminary commit of NFSv4.2 definitions that will be used by
subsequent commits which adds NFSv4.2 support to the NFS client and server.

There will be a series of these preliminary commits that will prepare for
a major commit of the NFSv4.2 client/server changes currently found in
subversion under projects/nfsv42/sys.
This commit is contained in:
rmacklem 2019-12-06 01:53:02 +00:00
parent e24c59d129
commit b2bd31baaa
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys/fs/nfs/nfsproto.h
View File

@ -705,6 +705,7 @@
/* Flags for File Layout. */ /* Flags for File Layout. */
#define NFSFLAYUTIL_DENSE 0x1 #define NFSFLAYUTIL_DENSE 0x1
#define NFSFLAYUTIL_COMMIT_THRU_MDS 0x2 #define NFSFLAYUTIL_COMMIT_THRU_MDS 0x2
#define NFSFLAYUTIL_IOADVISE_THRU_MDS 0x4
#define NFSFLAYUTIL_STRIPE_MASK 0xffffffc0 #define NFSFLAYUTIL_STRIPE_MASK 0xffffffc0
/* Flags for Flex File Layout. */ /* Flags for Flex File Layout. */
@ -874,6 +875,24 @@ struct nfsv3_sattr {
u_int32_t sa_mtimetype; u_int32_t sa_mtimetype;
nfstime3 sa_mtime; nfstime3 sa_mtime;
}; };
/*
* IO Advise hint bits for NFSv4.2.
* Since these go on the wire as a bitmap, the NFSATTRBIT macros are
* used to manipulate these bits.
*/
#define NFSV4IOHINT_NORMAL 0
#define NFSV4IOHINT_SEQUENTIAL 1
#define NFSV4IOHINT_SEQUENTIALBACK 2
#define NFSV4IOHINT_RANDOM 3
#define NFSV4IOHINT_WILLNEED 4
#define NFSV4IOHINT_WILLNEEDOPTUN 5
#define NFSV4IOHINT_DONTNEED 6
#define NFSV4IOHINT_NOREUSE 7
#define NFSV4IOHINT_READ 8
#define NFSV4IOHINT_WRITE 9
#define NFSV4IOHINT_INITPROXIMITY 10
#endif /* _KERNEL */ #endif /* _KERNEL */
/* /*
@ -960,6 +979,12 @@ struct nfsv3_sattr {
#define NFSATTRBIT_MODESETMASKED 74 #define NFSATTRBIT_MODESETMASKED 74
#define NFSATTRBIT_SUPPATTREXCLCREAT 75 #define NFSATTRBIT_SUPPATTREXCLCREAT 75
#define NFSATTRBIT_FSCHARSETCAP 76 #define NFSATTRBIT_FSCHARSETCAP 76
#define NFSATTRBIT_CLONEBLKSIZE 77
#define NFSATTRBIT_SPACEFREED 78
#define NFSATTRBIT_CHANGEATTRTYPE 79
#define NFSATTRBIT_SECLABEL 80
/* Not sure what attribute bit #81 is? */
#define NFSATTRBIT_XATTRSUPPORT 82
#define NFSATTRBM_SUPPORTEDATTRS 0x00000001 #define NFSATTRBM_SUPPORTEDATTRS 0x00000001
#define NFSATTRBM_TYPE 0x00000002 #define NFSATTRBM_TYPE 0x00000002
@ -1038,6 +1063,12 @@ struct nfsv3_sattr {
#define NFSATTRBM_MODESETMASKED 0x00000400 #define NFSATTRBM_MODESETMASKED 0x00000400
#define NFSATTRBM_SUPPATTREXCLCREAT 0x00000800 #define NFSATTRBM_SUPPATTREXCLCREAT 0x00000800
#define NFSATTRBM_FSCHARSETCAP 0x00001000 #define NFSATTRBM_FSCHARSETCAP 0x00001000
#define NFSATTRBM_CLONEBLKSIZE 0x00002000
#define NFSATTRBM_SPACEFREED 0x00004000
#define NFSATTRBM_CHANGEATTRTYPE 0x00008000
#define NFSATTRBM_SECLABEL 0x00010000
/* Not sure what attribute bit#81/0x00020000 is? */
#define NFSATTRBM_XATTRSUPPORT 0x00040000
#define NFSATTRBIT_MAX 77 #define NFSATTRBIT_MAX 77
@ -1161,6 +1192,11 @@ struct nfsv3_sattr {
NFSATTRBM_MODESETMASKED | \ NFSATTRBM_MODESETMASKED | \
NFSATTRBM_SUPPATTREXCLCREAT) NFSATTRBM_SUPPATTREXCLCREAT)
/*
* NFSATTRBIT_NFSV42 - Attributes only supported by NFSv4.2.
*/
#define NFSATTRBIT_NFSV42_2 NFSATTRBM_XATTRSUPPORT
/* /*
* Set of attributes that the getattr vnode op needs. * Set of attributes that the getattr vnode op needs.
* OR of the following bits. * OR of the following bits.
@ -1463,4 +1499,13 @@ typedef struct nfsv4stateid nfsv4stateid_t;
#define NFSV4LAYOUTRET_FSID 2 #define NFSV4LAYOUTRET_FSID 2
#define NFSV4LAYOUTRET_ALL 3 #define NFSV4LAYOUTRET_ALL 3
/* Seek Contents. */
#define NFSV4CONTENT_DATA 0
#define NFSV4CONTENT_HOLE 1
/* Options for Set Extended attribute (RFC-8276). */
#define NFSV4SXATTR_EITHER 0
#define NFSV4SXATTR_CREATE 1
#define NFSV4SXATTR_REPLACE 2
#endif /* _NFS_NFSPROTO_H_ */ #endif /* _NFS_NFSPROTO_H_ */