Merge tag 'md/3.16' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / export.h

diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h
index d7939a62a0ae64a5b7caf2de48605dab61d0d483..cfeea85c5bed1f20bdc56e261423c6d95d6a8c7b 100644 (file)
--- a/fs/nfsd/export.h
+++ b/fs/nfsd/export.h
@@ -37,6 +37,7 @@ struct nfsd4_fs_locations {
  * spkm3i, and spkm3p (and using all 8 at once should be rare).
  */
 #define MAX_SECINFO_LIST       8
+#define EX_UUID_LEN            16
 
 struct exp_flavor_info {
        u32     pseudoflavor;
@@ -53,7 +54,7 @@ struct svc_export {
        int                     ex_fsid;
        unsigned char *         ex_uuid; /* 16 byte fsid */
        struct nfsd4_fs_locations ex_fslocs;
-       int                     ex_nflavors;
+       uint32_t                ex_nflavors;
        struct exp_flavor_info  ex_flavors[MAX_SECINFO_LIST];
        struct cache_detail     *cd;
 };