BACKPORT: FIXUP: CHROMIUM: esdfs: Add option to set base namespace [chromiumos/third_party/kernel : chromeos-3.18]

[Gwendal Grignou (Gerrit)]

Gwendal Grignou merged this change.

View Change

Approvals: Gwendal Grignou: Looks good to me, approved; Verified

BACKPORT: FIXUP: CHROMIUM: esdfs: Add option to set base namespace

Building ESD_FS as module fails with:

ERROR: "proc_ns_fget" [fs/esdfs/esdfs.ko] undefined!
ERROR: "userns_operations" [fs/esdfs/esdfs.ko] undefined!

Export both to fix the problem. Also make the new dependency
on USER_NS explicit.

Modify fs/proc/namespaces.c instead of fs/nsfs.c.

BUG=b:63876697
TEST=Build esdfs as module

Change-Id: I82e6a891cf3de8d80683dd57b815f5917cb6a826
Signed-off-by: Guenter Roeck <gro...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1055685
Reviewed-by: Gwendal Grignou <gwe...@chromium.org>
(cherry picked from commit 1c15351edef79308a4d6e1406752610691151dc1)
Signed-off-by: Gwendal Grignou <gwe...@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1066275
---
M fs/esdfs/Kconfig
M fs/proc/namespaces.c
M kernel/user_namespace.c
3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/esdfs/Kconfig b/fs/esdfs/Kconfig
index 9866c56..ea18d6d 100644
--- a/fs/esdfs/Kconfig
+++ b/fs/esdfs/Kconfig
@@ -1,6 +1,7 @@
 config ESD_FS
 	tristate "Emulated 'SD card' file system for Android (EXPERIMENTAL)"
 	depends on PKGLIST
+	depends on USER_NS
 	help
 	  Esdfs is a wrapfs-based file system, designed to implement the
 	  Android "sdcard" FUSE-backed file system from within the kernel.
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 5c3e162..5da43d21 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -288,6 +288,7 @@
 	fput(file);
 	return ERR_PTR(-EINVAL);
 }
+EXPORT_SYMBOL(proc_ns_fget);
 
 struct proc_ns *get_proc_ns(struct inode *inode)
 {
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index d30c055..31da906 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -999,6 +999,7 @@
 	.put		= userns_put,
 	.install	= userns_install,
 };
+EXPORT_SYMBOL(userns_operations);
 
 static __init int user_namespaces_init(void)
 {

To view, visit change 1066275. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: chromiumos/third_party/kernel

Gerrit-Branch: chromeos-3.18

Gerrit-Change-Id: I82e6a891cf3de8d80683dd57b815f5917cb6a826

Gerrit-Change-Number: 1066275

Gerrit-PatchSet: 3

Gerrit-Owner: Gwendal Grignou <gwe...@chromium.org>

Gerrit-Reviewer: Guenter Roeck <gro...@chromium.org>

Gerrit-Reviewer: Gwendal Grignou <gwe...@chromium.org>

Gerrit-Reviewer: Sarthak Kukreti <sarthak...@chromium.org>

Gerrit-MessageType: merged