X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Flinux%2Fnfs4.h;h=1be5be88debe77c5e51aed74ef77fb8697974b5f;hb=a205752d1ad2d37d6597aaae5a56fc396a770868;hp=1059e6d69d3bc8d38380bf0a213632dd6f729e66;hpb=1323523f505606cfd24af6122369afddefc3b09d;p=~andy%2Flinux

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 1059e6d69d3..1be5be88deb 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -105,12 +105,11 @@ struct nfs4_ace {
 	uint32_t	access_mask;
 	int		whotype;
 	uid_t		who;
-	struct list_head l_ace;
 };
 
 struct nfs4_acl {
 	uint32_t	naces;
-	struct list_head ace_head;
+	struct nfs4_ace	aces[0];
 };
 
 typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
@@ -157,6 +156,12 @@ enum nfs_opnum4 {
 	OP_ILLEGAL = 10044,
 };
 
+/*Defining first and last NFS4 operations implemented.
+Needs to be updated if more operations are defined in future.*/
+
+#define FIRST_NFS4_OP	OP_ACCESS
+#define LAST_NFS4_OP 	OP_RELEASE_LOCKOWNER
+
 enum nfsstat4 {
 	NFS4_OK = 0,
 	NFS4ERR_PERM = 1,
@@ -384,6 +389,7 @@ enum {
 	NFSPROC4_CLNT_DELEGRETURN,
 	NFSPROC4_CLNT_GETACL,
 	NFSPROC4_CLNT_SETACL,
+	NFSPROC4_CLNT_FS_LOCATIONS,
 };
 
 #endif