From 91be4236fbe0d70e092f58d1503d874a76dee1e7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 7 Mar 2022 20:45:25 +0100 Subject: [PATCH] ANDROID: GKI: remove vfs-only namespace from 2 symbols Commit d483eed85ffb ("ANDROID: GKI: set vfs-only exports into their own namespace") moved a bunch of symbols into a vfs-only namespace to make it possible for some external filesystem modules to be able to use them. Unfortunately the following two symbols were already being marked used by external modules, and moving them into a different namespace broke existing users of these symbols: kern_path __sync_dirty_buffer The ABI checking tools do not take the namespace of the symbol into consideration when checking, as that is a Linux kernel "add-on" and not part of the kernel symbol table information directly, which is why this was not caught earlier. Bug: 157965270 Bug: 210074446 Bug: 216253405 Bug: 219830266 Fixes: d483eed85ffb ("ANDROID: GKI: set vfs-only exports into their own namespace") Signed-off-by: Greg Kroah-Hartman Change-Id: I4a791edb33312da232cb088613bd4eb8f5548239 --- fs/buffer.c | 2 +- fs/namei.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index d3916df01380..dd992943b270 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3189,7 +3189,7 @@ int __sync_dirty_buffer(struct buffer_head *bh, int op_flags) } return ret; } -EXPORT_SYMBOL_NS(__sync_dirty_buffer, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(__sync_dirty_buffer); int sync_dirty_buffer(struct buffer_head *bh) { diff --git a/fs/namei.c b/fs/namei.c index 297b2a774eaf..a462eccbf53d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2533,7 +2533,7 @@ int kern_path(const char *name, unsigned int flags, struct path *path) return filename_lookup(AT_FDCWD, getname_kernel(name), flags, path, NULL); } -EXPORT_SYMBOL_NS(kern_path, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(kern_path); /** * vfs_path_lookup - lookup a file path relative to a dentry-vfsmount pair