NFS NFSD: defining nl4_servers structure needed by both

These structures are needed by COPY_NOTIFY on the client and needed
by the nfsd as well

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index fd59904a282c90b05d9d228f9fbaac75dc3727ba..5810e248c1bd8d09f1a130c67b19bbcafba3f42a 100644 (file)
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -16,6 +16,7 @@
 #include <linux/list.h>
 #include <linux/uidgid.h>
 #include <uapi/linux/nfs4.h>
+#include <linux/sunrpc/msg_prot.h>
 
 enum nfs4_acl_whotype {
        NFS4_ACL_WHO_NAMED = 0,
@@ -674,4 +675,27 @@ struct nfs4_op_map {
        } u;
 };
 
+struct nfs42_netaddr {
+       char            netid[RPCBIND_MAXNETIDLEN];
+       char            addr[RPCBIND_MAXUADDRLEN + 1];
+       u32             netid_len;
+       u32             addr_len;
+};
+
+enum netloc_type4 {
+       NL4_NAME                = 1,
+       NL4_URL                 = 2,
+       NL4_NETADDR             = 3,
+};
+
+struct nl4_server {
+       enum netloc_type4       nl4_type;
+       union {
+               struct { /* NL4_NAME, NL4_URL */
+                       int     nl4_str_sz;
+                       char    nl4_str[NFS4_OPAQUE_LIMIT + 1];
+               };
+               struct nfs42_netaddr    nl4_addr; /* NL4_NETADDR */
+       } u;
+};
 #endif