From 904cd51b69198652ce85c838957489253fc713b8 Mon Sep 17 00:00:00 2001 From: Euler Blade Date: Sat, 11 Sep 2021 09:08:11 +0000 Subject: [PATCH] fix vfs EXPORT_SYMBOL_NS to EXPORT_SYMBOL --- fs/namei.c | 14 +++++++------- fs/open.c | 4 ++-- fs/read_write.c | 4 ++-- fs/stat.c | 2 +- fs/xattr.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c1919544f..8a57cfd68 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2509,7 +2509,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 @@ -2989,7 +2989,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, fsnotify_create(dir, dentry); return error; } -EXPORT_SYMBOL_NS(vfs_create, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_create); int vfs_mkobj(struct dentry *dentry, umode_t mode, int (*f)(struct dentry *, umode_t, void *), @@ -3896,7 +3896,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) fsnotify_mkdir(dir, dentry); return error; } -EXPORT_SYMBOL_NS(vfs_mkdir, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_mkdir); long do_mkdirat(int dfd, const char __user *pathname, umode_t mode) { @@ -3971,7 +3971,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) d_delete(dentry); return error; } -EXPORT_SYMBOL_NS(vfs_rmdir, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_rmdir); long do_rmdir(int dfd, const char __user *pathname) { @@ -4094,7 +4094,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry, struct inode **delegate return error; } -EXPORT_SYMBOL_NS(vfs_unlink, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_unlink); /* * Make sure that the actual truncation of the file will occur outside its @@ -4330,7 +4330,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de fsnotify_link(dir, inode, new_dentry); return error; } -EXPORT_SYMBOL_NS(vfs_link, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_link); /* * Hardlinks are often used in delicate situations. We avoid @@ -4590,7 +4590,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, return error; } -EXPORT_SYMBOL_NS(vfs_rename, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_rename); static int do_renameat2(int olddfd, const char __user *oldname, int newdfd, const char __user *newname, unsigned int flags) diff --git a/fs/open.c b/fs/open.c index 88e42c2e8..dcbd01611 100644 --- a/fs/open.c +++ b/fs/open.c @@ -321,7 +321,7 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) file_end_write(file); return ret; } -EXPORT_SYMBOL_NS_GPL(vfs_fallocate, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL_GPL(vfs_fallocate); int ksys_fallocate(int fd, int mode, loff_t offset, loff_t len) { @@ -932,7 +932,7 @@ struct file *dentry_open(const struct path *path, int flags, } return f; } -EXPORT_SYMBOL_NS(dentry_open, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(dentry_open); struct file *open_with_fake_path(const struct path *path, int flags, struct inode *inode, const struct cred *cred) diff --git a/fs/read_write.c b/fs/read_write.c index 188169848..4eabc2c08 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -443,7 +443,7 @@ ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) set_fs(old_fs); return result; } -EXPORT_SYMBOL_NS(kernel_read, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(kernel_read); ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) { @@ -546,7 +546,7 @@ ssize_t kernel_write(struct file *file, const void *buf, size_t count, return res; } -EXPORT_SYMBOL_NS(kernel_write, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(kernel_write); ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos) { diff --git a/fs/stat.c b/fs/stat.c index ec9220cc1..c38e4c2e1 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -117,7 +117,7 @@ int vfs_getattr(const struct path *path, struct kstat *stat, return retval; return vfs_getattr_nosec(path, stat, request_mask, query_flags); } -EXPORT_SYMBOL_NS(vfs_getattr, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL(vfs_getattr); /** * vfs_statx_fd - Get the enhanced basic attributes by file descriptor diff --git a/fs/xattr.c b/fs/xattr.c index fb2a56352..81f0fb6d1 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -264,7 +264,7 @@ vfs_setxattr(struct dentry *dentry, const char *name, const void *value, } return error; } -EXPORT_SYMBOL_NS_GPL(vfs_setxattr, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL_GPL(vfs_setxattr); static ssize_t xattr_getsecurity(struct inode *inode, const char *name, void *value, @@ -378,7 +378,7 @@ vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) { return __vfs_getxattr(dentry, dentry->d_inode, name, value, size, 0); } -EXPORT_SYMBOL_NS_GPL(vfs_getxattr, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL_GPL(vfs_getxattr); ssize_t vfs_listxattr(struct dentry *dentry, char *list, size_t size) @@ -398,7 +398,7 @@ vfs_listxattr(struct dentry *dentry, char *list, size_t size) } return error; } -EXPORT_SYMBOL_NS_GPL(vfs_listxattr, ANDROID_GKI_VFS_EXPORT_ONLY); +EXPORT_SYMBOL_GPL(vfs_listxattr); int __vfs_removexattr(struct dentry *dentry, const char *name) -- 2.27.0