diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 716090e6..97871de4 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1280,7 +1280,9 @@ static int __init ovl_init(void)
 	int ret;
 
 	if (IS_ENABLED(CONFIG_OVERLAY_FS_V1)) {
+#ifdef CONFIG_OVERLAY_FS_V1
 		ret = register_filesystem(&ovl_v1_fs_type);
+#endif
 		if (ret)
 			return ret;
 	}
@@ -1293,7 +1295,11 @@ static void __exit ovl_exit(void)
 	unregister_filesystem(&ovl_fs_type);
 
 	if (IS_ENABLED(CONFIG_OVERLAY_FS_V1))
+	{
+#ifdef CONFIG_OVERLAY_FS_V1
 		unregister_filesystem(&ovl_v1_fs_type);
+#endif		
+	}
 }
 
 module_init(ovl_init);
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 0628de2a..47887f68 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -964,7 +964,7 @@ bool current_in_userns(const struct user_namespace *target_ns)
 	}
 	return false;
 }
-
+EXPORT_SYMBOL(current_in_userns);
 static inline struct user_namespace *to_user_ns(struct ns_common *ns)
 {
 	return container_of(ns, struct user_namespace, ns);
diff --git a/spl/configure b/spl/configure
old mode 100644
new mode 100755
diff --git a/zfs/configure b/zfs/configure
old mode 100644
new mode 100755