From 9e89f40c7634995084a4bafd7282525f8046471a Mon Sep 17 00:00:00 2001 From: Han Gao Date: Thu, 4 Apr 2024 00:34:28 +0800 Subject: [PATCH] feat: remove ANDROID_GKI_VFS_EXPORT_ONLY for all Signed-off-by: Han Gao --- fs/9p/v9fs.c | 1 - fs/Makefile | 2 -- fs/adfs/super.c | 1 - fs/affs/super.c | 1 - fs/afs/main.c | 1 - fs/autofs/init.c | 1 - fs/befs/linuxvfs.c | 1 - fs/bfs/inode.c | 1 - fs/binfmt_misc.c | 1 - fs/btrfs/super.c | 1 - fs/cachefiles/main.c | 1 - fs/ceph/super.c | 1 - fs/cifs/cifsfs.c | 1 - fs/coda/psdev.c | 1 - fs/cramfs/inode.c | 1 - fs/crypto/Makefile | 1 - fs/ecryptfs/main.c | 1 - fs/efivarfs/super.c | 1 - fs/efs/inode.c | 1 - fs/erofs/super.c | 1 - fs/exfat/super.c | 1 - fs/ext2/super.c | 1 - fs/ext4/super.c | 1 - fs/f2fs/super.c | 1 - fs/fat/inode.c | 1 - fs/fat/namei_msdos.c | 1 - fs/fat/namei_vfat.c | 1 - fs/freevxfs/vxfs_super.c | 1 - fs/fscache/Makefile | 1 - fs/fuse/inode.c | 1 - fs/gfs2/main.c | 1 - fs/hfs/super.c | 1 - fs/hfsplus/super.c | 1 - fs/hpfs/super.c | 1 - fs/incfs/main.c | 1 - fs/isofs/inode.c | 1 - fs/jbd2/Makefile | 1 - fs/jbd2/journal.c | 1 - fs/jffs2/super.c | 1 - fs/jfs/super.c | 1 - fs/minix/inode.c | 1 - fs/nfs/inode.c | 1 - fs/nfs/nfs4super.c | 1 - fs/nfsd/nfsctl.c | 1 - fs/nilfs2/super.c | 1 - fs/nls/nls_euc-jp.c | 1 - fs/nls/nls_koi8-ru.c | 1 - fs/ntfs/super.c | 1 - fs/ocfs2/dlmfs/dlmfs.c | 1 - fs/ocfs2/super.c | 1 - fs/omfs/inode.c | 1 - fs/orangefs/orangefs-mod.c | 1 - fs/overlayfs/super.c | 1 - fs/qnx4/inode.c | 1 - fs/qnx6/inode.c | 1 - fs/reiserfs/super.c | 1 - fs/romfs/super.c | 1 - fs/squashfs/super.c | 1 - fs/sysv/super.c | 1 - fs/ubifs/super.c | 1 - fs/udf/super.c | 1 - fs/ufs/super.c | 1 - fs/vboxsf/super.c | 1 - fs/verity/Makefile | 1 - fs/xfs/xfs_super.c | 1 - fs/zonefs/super.c | 1 - 66 files changed, 67 deletions(-) diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 6e3e65deb..39def020a 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -738,4 +738,3 @@ MODULE_AUTHOR("Latchesar Ionkov "); MODULE_AUTHOR("Eric Van Hensbergen "); MODULE_AUTHOR("Ron Minnich "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/Makefile b/fs/Makefile index 359c63fef..5dca3480e 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -6,8 +6,6 @@ # Rewritten to use lists instead of if-statements. # -subdir-ccflags-y += -DANDROID_GKI_VFS_EXPORT_ONLY=VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver - obj-y := open.o read_write.o file_table.o super.o \ char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \ ioctl.o readdir.o select.o dcache.o inode.o \ diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 57044e537..bdbd26e57 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c @@ -492,4 +492,3 @@ static void __exit exit_adfs_fs(void) module_init(init_adfs_fs) module_exit(exit_adfs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/affs/super.c b/fs/affs/super.c index 2d2797ef7..c6c2a513e 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -676,7 +676,6 @@ static void __exit exit_affs_fs(void) MODULE_DESCRIPTION("Amiga filesystem support for Linux"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_affs_fs) module_exit(exit_affs_fs) diff --git a/fs/afs/main.c b/fs/afs/main.c index c6bd95645..179004b15 100644 --- a/fs/afs/main.c +++ b/fs/afs/main.c @@ -18,7 +18,6 @@ MODULE_DESCRIPTION("AFS Client File System"); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); unsigned afs_debug; module_param_named(debug, afs_debug, uint, S_IWUSR | S_IRUGO); diff --git a/fs/autofs/init.c b/fs/autofs/init.c index ba08261f4..d3f55e874 100644 --- a/fs/autofs/init.c +++ b/fs/autofs/init.c @@ -44,4 +44,3 @@ static void __exit exit_autofs_fs(void) module_init(init_autofs_fs) module_exit(exit_autofs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index abb8f6bb7..c1ba13d19 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -34,7 +34,6 @@ MODULE_DESCRIPTION("BeOS File System (BeFS) driver"); MODULE_AUTHOR("Will Dyson"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); /* The units the vfs expects inode->i_blocks to be in */ #define VFS_BLOCK_SIZE 512 diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 293223cd4..fd691e481 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c @@ -22,7 +22,6 @@ MODULE_AUTHOR("Tigran Aivazian "); MODULE_DESCRIPTION("SCO UnixWare BFS filesystem for Linux"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); #undef DEBUG diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 3e4791efd..11b5bf241 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -832,4 +832,3 @@ static void __exit exit_misc_binfmt(void) core_initcall(init_misc_binfmt); module_exit(exit_misc_binfmt); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index b5d2005d3..2663485c1 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2597,7 +2597,6 @@ late_initcall(init_btrfs_fs); module_exit(exit_btrfs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_SOFTDEP("pre: crc32c"); MODULE_SOFTDEP("pre: xxhash64"); MODULE_SOFTDEP("pre: sha256"); diff --git a/fs/cachefiles/main.c b/fs/cachefiles/main.c index 0649e7e60..ddf0cd58d 100644 --- a/fs/cachefiles/main.c +++ b/fs/cachefiles/main.c @@ -28,7 +28,6 @@ MODULE_PARM_DESC(cachefiles_debug, "CacheFiles debugging mask"); MODULE_DESCRIPTION("Mounted-filesystem based cache"); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); struct kmem_cache *cachefiles_object_jar; diff --git a/fs/ceph/super.c b/fs/ceph/super.c index e0562c553..08c8d34c9 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1335,4 +1335,3 @@ MODULE_AUTHOR("Yehuda Sadeh "); MODULE_AUTHOR("Patience Warnick "); MODULE_DESCRIPTION("Ceph filesystem for Linux"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 3e3216089..370188b2a 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1693,7 +1693,6 @@ exit_cifs(void) MODULE_AUTHOR("Steve French"); MODULE_LICENSE("GPL"); /* combination of LGPL + GPL source behaves as GPL */ -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_DESCRIPTION ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and " "also older servers complying with the SNIA CIFS Specification)"); diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index 897c7cb93..240669f51 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -388,7 +388,6 @@ MODULE_AUTHOR("Jan Harkes, Peter J. Braam"); MODULE_DESCRIPTION("Coda Distributed File System VFS interface"); MODULE_ALIAS_CHARDEV_MAJOR(CODA_PSDEV_MAJOR); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_VERSION("7.0"); static int __init init_coda(void) diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 624547011..4b90cfd1e 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -1010,4 +1010,3 @@ static void __exit exit_cramfs_fs(void) module_init(init_cramfs_fs) module_exit(exit_cramfs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/crypto/Makefile b/fs/crypto/Makefile index d39077502..3e13d8a9c 100644 --- a/fs/crypto/Makefile +++ b/fs/crypto/Makefile @@ -1,7 +1,6 @@ # 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 \ diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index eb12d38d0..b2f6a1937 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -891,7 +891,6 @@ MODULE_AUTHOR("Michael A. Halcrow "); MODULE_DESCRIPTION("eCryptfs"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(ecryptfs_init) module_exit(ecryptfs_exit) diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index b62aefe3b..15880a68f 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -272,7 +272,6 @@ static __exit void efivarfs_exit(void) MODULE_AUTHOR("Matthew Garrett, Jeremy Kerr"); MODULE_DESCRIPTION("EFI Variable Filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_ALIAS_FS("efivarfs"); module_init(efivarfs_init); diff --git a/fs/efs/inode.c b/fs/efs/inode.c index 8c0ecaa62..89e73a6f0 100644 --- a/fs/efs/inode.c +++ b/fs/efs/inode.c @@ -311,4 +311,3 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { } MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 92d9a4a9f..22991d22a 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -752,5 +752,4 @@ module_exit(erofs_module_exit); MODULE_DESCRIPTION("Enhanced ROM File System"); MODULE_AUTHOR("Gao Xiang, Chao Yu, Miao Xie, CONSUMER BG, HUAWEI Inc."); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/exfat/super.c b/fs/exfat/super.c index 69068a916..ba70ed1c9 100644 --- a/fs/exfat/super.c +++ b/fs/exfat/super.c @@ -836,6 +836,5 @@ module_exit(exit_exfat_fs); MODULE_ALIAS_FS("exfat"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_DESCRIPTION("exFAT filesystem support"); MODULE_AUTHOR("Samsung Electronics Co., Ltd."); diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 2588d3ae1..b6314d3c6 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1654,6 +1654,5 @@ static void __exit exit_ext2_fs(void) MODULE_AUTHOR("Remy Card and others"); MODULE_DESCRIPTION("Second Extended Filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_ext2_fs) module_exit(exit_ext2_fs) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 7b799dae9..7d274b7a5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6770,7 +6770,6 @@ static void __exit ext4_exit_fs(void) MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Fourth Extended Filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_SOFTDEP("pre: crc32c"); module_init(ext4_init_fs) module_exit(ext4_exit_fs) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 532d2546b..8a4d87667 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4487,6 +4487,5 @@ module_exit(exit_f2fs_fs) MODULE_AUTHOR("Samsung Electronics's Praesto Team"); MODULE_DESCRIPTION("Flash Friendly File System"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_SOFTDEP("pre: crc32"); diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 577c73a55..bab9b202b 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1979,4 +1979,3 @@ module_init(init_fat_fs) module_exit(exit_fat_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c index 8376577ba..9d062886f 100644 --- a/fs/fat/namei_msdos.c +++ b/fs/fat/namei_msdos.c @@ -680,7 +680,6 @@ static void __exit exit_msdos_fs(void) } MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_AUTHOR("Werner Almesberger"); MODULE_DESCRIPTION("MS-DOS filesystem support"); diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 01fab05dc..0cdd0fb9f 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -1077,7 +1077,6 @@ static void __exit exit_vfat_fs(void) } MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_DESCRIPTION("VFAT filesystem support"); MODULE_AUTHOR("Gordon Chaffee"); diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c index 88fe3f470..578a50627 100644 --- a/fs/freevxfs/vxfs_super.c +++ b/fs/freevxfs/vxfs_super.c @@ -52,7 +52,6 @@ MODULE_AUTHOR("Christoph Hellwig, Krzysztof Blaszkowski"); MODULE_DESCRIPTION("Veritas Filesystem (VxFS) driver"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static struct kmem_cache *vxfs_inode_cachep; diff --git a/fs/fscache/Makefile b/fs/fscache/Makefile index 9121382cf..df1f55cf5 100644 --- a/fs/fscache/Makefile +++ b/fs/fscache/Makefile @@ -3,7 +3,6 @@ # Makefile for general filesystem caching code # -ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY fscache-y := \ cache.o \ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index b6222bdae..d44bd00d7 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -27,7 +27,6 @@ MODULE_AUTHOR("Miklos Szeredi "); MODULE_DESCRIPTION("Filesystem in Userspace"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static struct kmem_cache *fuse_inode_cachep; struct list_head fuse_conn_list; diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 81925fd29..c7393ee9c 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -260,7 +260,6 @@ static void __exit exit_gfs2_fs(void) MODULE_DESCRIPTION("Global File System"); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_gfs2_fs); module_exit(exit_gfs2_fs); diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 6432d65a0..12d9bae39 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c @@ -29,7 +29,6 @@ static struct kmem_cache *hfs_inode_cachep; MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static int hfs_sync_fs(struct super_block *sb, int wait) { diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 2b0031c6d..807119ae5 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -617,7 +617,6 @@ out: MODULE_AUTHOR("Brad Boyer"); MODULE_DESCRIPTION("Extended Macintosh Filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static struct kmem_cache *hfsplus_inode_cachep; diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index d7598d70f..a7dbfc892 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -791,4 +791,3 @@ static void __exit exit_hpfs_fs(void) module_init(init_hpfs_fs) module_exit(exit_hpfs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/incfs/main.c b/fs/incfs/main.c index 213faa5e9..23347acac 100644 --- a/fs/incfs/main.c +++ b/fs/incfs/main.c @@ -44,6 +44,5 @@ module_init(init_incfs_module); module_exit(cleanup_incfs_module); MODULE_LICENSE("GPL v2"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_AUTHOR("Eugene Zemtsov "); MODULE_DESCRIPTION("Incremental File System"); diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index ecbc8ef0d..f62b5a501 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -1612,4 +1612,3 @@ static void __exit exit_iso9660_fs(void) module_init(init_iso9660_fs) module_exit(exit_iso9660_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/jbd2/Makefile b/fs/jbd2/Makefile index b64f93331..45e518353 100644 --- a/fs/jbd2/Makefile +++ b/fs/jbd2/Makefile @@ -3,7 +3,6 @@ # Makefile for the linux journaling routines. # -ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=ANDROID_GKI_VFS_EXPORT_ONLY obj-$(CONFIG_JBD2) += jbd2.o diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 099e43198..b748329bb 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -3014,7 +3014,6 @@ static void __exit journal_exit(void) } MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(journal_init); module_exit(journal_exit); diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 16dcc359f..81ca58c10 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -439,4 +439,3 @@ MODULE_DESCRIPTION("The Journalling Flash File System, v2"); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); // Actually dual-licensed, but it doesn't matter for // the sake of this tag. It's Free Software. -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 8a02b9bde..b2dc4d1f9 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -37,7 +37,6 @@ MODULE_DESCRIPTION("The Journaled Filesystem (JFS)"); MODULE_AUTHOR("Steve Best/Dave Kleikamp/Barry Arndt, IBM"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static struct kmem_cache *jfs_inode_cachep; diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 09222efe7..e938f5b1e 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -720,5 +720,4 @@ static void __exit exit_minix_fs(void) module_init(init_minix_fs) module_exit(exit_minix_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 62e361c8f..1adece1cf 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -2336,7 +2336,6 @@ static void __exit exit_nfs_fs(void) /* Not quite true; I just maintain it */ MODULE_AUTHOR("Olaf Kirch "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_param(enable_ino64, bool, 0644); module_init(init_nfs_fs) diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index b422e8a09..d09bcfd7d 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -309,7 +309,6 @@ static void __exit exit_nfs_v4(void) } MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_nfs_v4); module_exit(exit_nfs_v4); diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 2796ecfdf..dedec4771 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1584,6 +1584,5 @@ static void __exit exit_nfsd(void) MODULE_AUTHOR("Olaf Kirch "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_nfsd) module_exit(exit_nfsd) diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index ab1a5e846..4abd928b0 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c @@ -53,7 +53,6 @@ MODULE_AUTHOR("NTT Corp."); MODULE_DESCRIPTION("A New Implementation of the Log-structured Filesystem " "(NILFS)"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); static struct kmem_cache *nilfs_inode_cachep; struct kmem_cache *nilfs_transaction_cachep; diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c index 498b8a435..162b3f160 100644 --- a/fs/nls/nls_euc-jp.c +++ b/fs/nls/nls_euc-jp.c @@ -578,4 +578,3 @@ module_init(init_nls_euc_jp) module_exit(exit_nls_euc_jp) MODULE_LICENSE("Dual BSD/GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c index 99ceec908..a80a741a8 100644 --- a/fs/nls/nls_koi8-ru.c +++ b/fs/nls/nls_koi8-ru.c @@ -80,4 +80,3 @@ module_init(init_nls_koi8_ru) module_exit(exit_nls_koi8_ru) MODULE_LICENSE("Dual BSD/GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 56edd625c..0d7e948cb 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -3186,7 +3186,6 @@ MODULE_AUTHOR("Anton Altaparmakov "); MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc."); MODULE_VERSION(NTFS_VERSION); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); #ifdef DEBUG module_param(debug_msgs, bint, 0); MODULE_PARM_DESC(debug_msgs, "Enable debug messages."); diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 5b3a8681f..583820ec6 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -615,7 +615,6 @@ static void __exit exit_dlmfs_fs(void) MODULE_AUTHOR("Oracle"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_DESCRIPTION("OCFS2 DLM-Filesystem"); module_init(init_dlmfs_fs) diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index d7eb00f1e..477ad05a3 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -71,7 +71,6 @@ static struct dentry *ocfs2_debugfs_root; MODULE_AUTHOR("Oracle"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_DESCRIPTION("OCFS2 cluster file system"); struct mount_options diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index 27143a2cd..ce93ccca8 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c @@ -20,7 +20,6 @@ MODULE_AUTHOR("Bob Copeland "); MODULE_DESCRIPTION("OMFS (ReplayTV/Karma) Filesystem for Linux"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); struct buffer_head *omfs_bread(struct super_block *sb, sector_t block) { diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c index a76a6ba8b..74a3d6337 100644 --- a/fs/orangefs/orangefs-mod.c +++ b/fs/orangefs/orangefs-mod.c @@ -36,7 +36,6 @@ int orangefs_dcache_timeout_msecs = 50; int orangefs_getattr_timeout_msecs = 50; MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_AUTHOR("ORANGEFS Development Team"); MODULE_DESCRIPTION("The Linux Kernel VFS interface to ORANGEFS"); MODULE_PARM_DESC(module_parm_debug_mask, "debugging level (see orangefs-debug.h for values)"); diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 4a2ce2eee..e7f7163fa 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -20,7 +20,6 @@ MODULE_AUTHOR("Miklos Szeredi "); MODULE_DESCRIPTION("Overlay filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); struct ovl_dir_cache; diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 704fb7d09..3fb7fc819 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -420,5 +420,4 @@ static void __exit exit_qnx4_fs(void) module_init(init_qnx4_fs) module_exit(exit_qnx4_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c index ac771f0e0..61191f7bd 100644 --- a/fs/qnx6/inode.c +++ b/fs/qnx6/inode.c @@ -679,4 +679,3 @@ static void __exit exit_qnx6_fs(void) module_init(init_qnx6_fs) module_exit(exit_qnx6_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index d84c2f2df..913f5af9b 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -2655,7 +2655,6 @@ MODULE_ALIAS_FS("reiserfs"); MODULE_DESCRIPTION("ReiserFS journaled filesystem"); MODULE_AUTHOR("Hans Reiser "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_reiserfs_fs); module_exit(exit_reiserfs_fs); diff --git a/fs/romfs/super.c b/fs/romfs/super.c index c335658c2..259f684d9 100644 --- a/fs/romfs/super.c +++ b/fs/romfs/super.c @@ -666,4 +666,3 @@ module_exit(exit_romfs_fs); MODULE_DESCRIPTION("Direct-MTD Capable RomFS"); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); /* Actually dual-licensed, but it doesn't matter for */ -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 83c48769f..88cc94be1 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -498,4 +498,3 @@ module_exit(exit_squashfs_fs); MODULE_DESCRIPTION("squashfs 4.0, a compressed read-only filesystem"); MODULE_AUTHOR("Phillip Lougher "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/sysv/super.c b/fs/sysv/super.c index e5383bff5..cc8e2ed15 100644 --- a/fs/sysv/super.c +++ b/fs/sysv/super.c @@ -592,4 +592,3 @@ static void __exit exit_sysv_fs(void) module_init(init_sysv_fs) module_exit(exit_sysv_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 54093d0a8..6a8f9efc2 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2475,7 +2475,6 @@ static void __exit ubifs_exit(void) module_exit(ubifs_exit); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_VERSION(__stringify(UBIFS_VERSION)); MODULE_AUTHOR("Artem Bityutskiy, Adrian Hunter"); MODULE_DESCRIPTION("UBIFS - UBI File System"); diff --git a/fs/udf/super.c b/fs/udf/super.c index c31c5c44b..3448098e5 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -2545,6 +2545,5 @@ static unsigned int udf_count_free(struct super_block *sb) MODULE_AUTHOR("Ben Fennema"); MODULE_DESCRIPTION("Universal Disk Format Filesystem"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(init_udf_fs) module_exit(exit_udf_fs) diff --git a/fs/ufs/super.c b/fs/ufs/super.c index e0d7149f7..983558b57 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -1542,4 +1542,3 @@ static void __exit exit_ufs_fs(void) module_init(init_ufs_fs) module_exit(exit_ufs_fs) MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c index 0d4a0408c..c578e772c 100644 --- a/fs/vboxsf/super.c +++ b/fs/vboxsf/super.c @@ -482,5 +482,4 @@ module_exit(vboxsf_fini); MODULE_DESCRIPTION("Oracle VM VirtualBox Module for Host File System Access"); MODULE_AUTHOR("Oracle Corporation"); MODULE_LICENSE("GPL v2"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); MODULE_ALIAS_FS("vboxsf"); diff --git a/fs/verity/Makefile b/fs/verity/Makefile index 4b8323450..48bd9ebdf 100644 --- a/fs/verity/Makefile +++ b/fs/verity/Makefile @@ -1,6 +1,5 @@ # 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 \ diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 6a7724a35..e3e229e52 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -2224,4 +2224,3 @@ module_exit(exit_xfs_fs); MODULE_AUTHOR("Silicon Graphics, Inc."); MODULE_DESCRIPTION(XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 0ed752c6e..e60759d8b 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -1800,6 +1800,5 @@ MODULE_AUTHOR("Damien Le Moal"); MODULE_DESCRIPTION("Zone file system for zoned block devices"); MODULE_LICENSE("GPL"); MODULE_ALIAS_FS("zonefs"); -MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); module_init(zonefs_init); module_exit(zonefs_exit);