diff options
| author | Jeff Layton <jlayton@kernel.org> | 2020-01-06 19:05:19 -0500 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2020-01-27 16:53:40 +0100 |
| commit | 24604f7e2bde5e6458812c3e9ee2a0d60c8c99fe (patch) | |
| tree | ff7b6d8492c7c9bfd1af17a62182b7f5fcf3cfe2 | |
| parent | d36e0b620aa53d9a33c739f0368e85707a997430 (diff) | |
| download | linux-24604f7e2bde5e6458812c3e9ee2a0d60c8c99fe.tar.bz2 | |
ceph: move net/ceph/ceph_fs.c to fs/ceph/util.c
All of these functions are only called from CephFS, so move them into
ceph.ko, and drop the exports.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
| -rw-r--r-- | fs/ceph/Makefile | 2 | ||||
| -rw-r--r-- | fs/ceph/util.c (renamed from net/ceph/ceph_fs.c) | 4 | ||||
| -rw-r--r-- | net/ceph/Makefile | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile index c1da294418d1..0a0823d378db 100644 --- a/fs/ceph/Makefile +++ b/fs/ceph/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_CEPH_FS) += ceph.o ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ export.o caps.o snap.o xattr.o quota.o io.o \ mds_client.o mdsmap.o strings.o ceph_frag.o \ - debugfs.o + debugfs.o util.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.o diff --git a/net/ceph/ceph_fs.c b/fs/ceph/util.c index 756a2dc10d27..2c34875675bf 100644 --- a/net/ceph/ceph_fs.c +++ b/fs/ceph/util.c @@ -39,7 +39,6 @@ void ceph_file_layout_from_legacy(struct ceph_file_layout *fl, fl->stripe_count == 0 && fl->object_size == 0) fl->pool_id = -1; } -EXPORT_SYMBOL(ceph_file_layout_from_legacy); void ceph_file_layout_to_legacy(struct ceph_file_layout *fl, struct ceph_file_layout_legacy *legacy) @@ -52,7 +51,6 @@ void ceph_file_layout_to_legacy(struct ceph_file_layout *fl, else legacy->fl_pg_pool = 0; } -EXPORT_SYMBOL(ceph_file_layout_to_legacy); int ceph_flags_to_mode(int flags) { @@ -82,7 +80,6 @@ int ceph_flags_to_mode(int flags) return mode; } -EXPORT_SYMBOL(ceph_flags_to_mode); int ceph_caps_for_mode(int mode) { @@ -101,4 +98,3 @@ int ceph_caps_for_mode(int mode) return caps; } -EXPORT_SYMBOL(ceph_caps_for_mode); diff --git a/net/ceph/Makefile b/net/ceph/Makefile index 59d0ba2072de..ce09bb4fb249 100644 --- a/net/ceph/Makefile +++ b/net/ceph/Makefile @@ -13,5 +13,5 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ auth.o auth_none.o \ crypto.o armor.o \ auth_x.o \ - ceph_fs.o ceph_strings.o ceph_hash.o \ + ceph_strings.o ceph_hash.o \ pagevec.o snapshot.o string_table.o |