From eff1ffbf0c097512fe2c92462b6183f716afb770 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Thu, 7 Apr 2022 19:58:31 +0200
Subject: [PATCH] ANDROID: GKI: set more vfs-only exports into their own
 namespace

There are more vfs-only symbols that OEMs want to use, so place them in
the proper vfs-only namespace.

Bug: 157965270
Bug: 210074446
Bug: 227656251
Cc: Matthias Maennich <maennich@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I99b9facc8da45fb329f6627d204180d1f89bcf97
---
 fs/crypto/Makefile  | 2 ++
 fs/fs_types.c       | 2 +-
 fs/fscache/Makefile | 2 ++
 fs/jbd2/Makefile    | 2 ++
 fs/verity/Makefile  | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/crypto/Makefile b/fs/crypto/Makefile
index 652c7180ec6d..d39077502e06 100644
--- a/fs/crypto/Makefile
+++ b/fs/crypto/Makefile
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_FS_ENCRYPTION)	+= fscrypto.o
 
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY
+
 fscrypto-y := crypto.o \
 	      fname.o \
 	      hkdf.o \
diff --git a/fs/fs_types.c b/fs/fs_types.c
index 78365e5dc08c..a11a1d8c7811 100644
--- a/fs/fs_types.c
+++ b/fs/fs_types.c
@@ -41,7 +41,7 @@ unsigned char fs_ftype_to_dtype(unsigned int filetype)
 
 	return fs_dtype_by_ftype[filetype];
 }
-EXPORT_SYMBOL_GPL(fs_ftype_to_dtype);
+EXPORT_SYMBOL_NS_GPL(fs_ftype_to_dtype, ANDROID_GKI_VFS_EXPORT_ONLY);
 
 /*
  * dirent file type to fs on-disk file type conversion
diff --git a/fs/fscache/Makefile b/fs/fscache/Makefile
index 79e08e05ef84..9121382cf16d 100644
--- a/fs/fscache/Makefile
+++ b/fs/fscache/Makefile
@@ -3,6 +3,8 @@
 # Makefile for general filesystem caching code
 #
 
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY
+
 fscache-y := \
 	cache.o \
 	cookie.o \
diff --git a/fs/jbd2/Makefile b/fs/jbd2/Makefile
index 126b4da6c7de..b64f93331643 100644
--- a/fs/jbd2/Makefile
+++ b/fs/jbd2/Makefile
@@ -3,6 +3,8 @@
 # Makefile for the linux journaling routines.
 #
 
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY
+
 obj-$(CONFIG_JBD2) += jbd2.o
 
 jbd2-objs := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o
diff --git a/fs/verity/Makefile b/fs/verity/Makefile
index 435559a4fa9e..4b8323450f90 100644
--- a/fs/verity/Makefile
+++ b/fs/verity/Makefile
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY
+
 obj-$(CONFIG_FS_VERITY) += enable.o \
 			   hash_algs.o \
 			   init.o \