Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fs/overlayfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion kernel/user_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Empty file modified spl/configure
100644 → 100755
Empty file.
Empty file modified zfs/configure
100644 → 100755
Empty file.