Commit 6a68aed6 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Add new attribute delegation definitions 



Add the attribute delegation XDR definitions from the spec.

Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarLance Shelton <lance.shelton@hammerspace.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 7cca0e96

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -3852,7 +3852,7 @@ static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync) 


#define FATTR4_WORD1_NFS40_MASK (2*FATTR4_WORD1_MOUNTED_ON_FILEID - 1UL)

#define FATTR4_WORD2_NFS41_MASK (2*FATTR4_WORD2_SUPPATTR_EXCLCREAT - 1UL)

#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_XATTR_SUPPORT - 1UL)

#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_TIME_DELEG_MODIFY - 1UL)



static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)

{

include/linux/nfs4.h

+9 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ enum open_delegation_type4 { 
	NFS4_OPEN_DELEGATE_READ = 1,

	NFS4_OPEN_DELEGATE_WRITE = 2,

	NFS4_OPEN_DELEGATE_NONE_EXT = 3, /* 4.1 */

	NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG = 4,

	NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG = 5,

};



enum why_no_delegation4 { /* new to v4.1 */
@@ -507,6 +509,11 @@ enum { 
	FATTR4_XATTR_SUPPORT		= 82,

};



enum {

	FATTR4_TIME_DELEG_ACCESS	= 84,

	FATTR4_TIME_DELEG_MODIFY	= 85,

};



/*

 * The following internal definitions enable processing the above

 * attribute bits within 32-bit word boundaries.
@@ -586,6 +593,8 @@ enum { 
#define FATTR4_WORD2_SECURITY_LABEL     BIT(FATTR4_SEC_LABEL - 64)

#define FATTR4_WORD2_MODE_UMASK		BIT(FATTR4_MODE_UMASK - 64)

#define FATTR4_WORD2_XATTR_SUPPORT	BIT(FATTR4_XATTR_SUPPORT - 64)

#define FATTR4_WORD2_TIME_DELEG_ACCESS	BIT(FATTR4_TIME_DELEG_ACCESS - 64)

#define FATTR4_WORD2_TIME_DELEG_MODIFY	BIT(FATTR4_TIME_DELEG_MODIFY - 64)



/* MDS threshold bitmap bits */

#define THRESHOLD_RD                    (1UL << 0)

include/uapi/linux/nfs4.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL	0x10000

#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED		0x20000



#define NFS4_SHARE_WANT_DELEG_TIMESTAMPS		0x100000



#define NFS4_CDFC4_FORE	0x1

#define NFS4_CDFC4_BACK 0x2

#define NFS4_CDFC4_BOTH 0x3