Merge commit 'origin' into devel

1 files changed, 3 insertions, 0 deletions

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 985dc2931031..4c1122a13844 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -3,6 +3,7 @@
  */
 
 #include <linux/mount.h>
+#include <linux/security.h>
 
 struct nfs_string;
 
@@ -57,6 +58,8 @@ struct nfs_parsed_mount_data {
                 char                    *export_path;
                 int                     protocol;
         } nfs_server;
+
+        struct security_mnt_opts lsm_opts;
 };
 
 /* client.c */