From 441ba323addbd863b24295fa4d27c88336cafec3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 29 May 2020 15:03:12 +0200 Subject: [PATCH] Revert "ANDROID: sdcardfs: Enable modular sdcardfs" This reverts commit c0dbfed5ff9fce7a701a33587ea5fea6a84f4dc3 as it is not needed now that sdcardfs is gone. Bug: 157700134 Cc: Daniel Rosenberg Cc: Guenter Roeck Cc: Alistair Strachan Cc: Yongqin Liu Cc: Daniel Rosenberg Signed-off-by: Greg Kroah-Hartman Change-Id: Ia738ff19487e2e3e129d2ef17ef1f28f777bf306 Signed-off-by: Greg Kroah-Hartman --- fs/fs_struct.c | 3 --- fs/read_write.c | 3 --- security/security.c | 1 - 3 files changed, 7 deletions(-) diff --git a/fs/fs_struct.c b/fs/fs_struct.c index 483730d262cb..ca639ed967b7 100644 --- a/fs/fs_struct.c +++ b/fs/fs_struct.c @@ -46,7 +46,6 @@ void set_fs_pwd(struct fs_struct *fs, const struct path *path) if (old_pwd.dentry) path_put(&old_pwd); } -EXPORT_SYMBOL_GPL(set_fs_pwd); static inline int replace_path(struct path *p, const struct path *old, const struct path *new) { @@ -92,7 +91,6 @@ void free_fs_struct(struct fs_struct *fs) path_put(&fs->pwd); kmem_cache_free(fs_cachep, fs); } -EXPORT_SYMBOL_GPL(free_fs_struct); void exit_fs(struct task_struct *tsk) { @@ -131,7 +129,6 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old) } return fs; } -EXPORT_SYMBOL_GPL(copy_fs_struct); int unshare_fs_struct(void) { diff --git a/fs/read_write.c b/fs/read_write.c index d7baa83e6e5f..7458fccc59e1 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -469,8 +469,6 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) return ret; } -EXPORT_SYMBOL_GPL(vfs_read); - static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) { struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len }; @@ -568,7 +566,6 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ return ret; } -EXPORT_SYMBOL_GPL(vfs_write); /* file_ppos returns &file->f_pos or NULL if file is stream */ static inline loff_t *file_ppos(struct file *file) diff --git a/security/security.c b/security/security.c index 008e797a03c3..cd2d18d2d279 100644 --- a/security/security.c +++ b/security/security.c @@ -1101,7 +1101,6 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) return 0; return call_int_hook(path_chown, 0, path, uid, gid); } -EXPORT_SYMBOL_GPL(security_path_chown); int security_path_chroot(const struct path *path) {