Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jeff Layton and committed by
Ilya Dryomov
24604f7e d36e0b62

+2 -6
+1 -1
fs/ceph/Makefile
··· 8 8 ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ 9 9 export.o caps.o snap.o xattr.o quota.o io.o \ 10 10 mds_client.o mdsmap.o strings.o ceph_frag.o \ 11 - debugfs.o 11 + debugfs.o util.o 12 12 13 13 ceph-$(CONFIG_CEPH_FSCACHE) += cache.o 14 14 ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.o
+1 -1
net/ceph/Makefile
··· 13 13 auth.o auth_none.o \ 14 14 crypto.o armor.o \ 15 15 auth_x.o \ 16 - ceph_fs.o ceph_strings.o ceph_hash.o \ 16 + ceph_strings.o ceph_hash.o \ 17 17 pagevec.o snapshot.o string_table.o
-4
net/ceph/ceph_fs.c fs/ceph/util.c
··· 39 39 fl->stripe_count == 0 && fl->object_size == 0) 40 40 fl->pool_id = -1; 41 41 } 42 - EXPORT_SYMBOL(ceph_file_layout_from_legacy); 43 42 44 43 void ceph_file_layout_to_legacy(struct ceph_file_layout *fl, 45 44 struct ceph_file_layout_legacy *legacy) ··· 51 52 else 52 53 legacy->fl_pg_pool = 0; 53 54 } 54 - EXPORT_SYMBOL(ceph_file_layout_to_legacy); 55 55 56 56 int ceph_flags_to_mode(int flags) 57 57 { ··· 80 82 81 83 return mode; 82 84 } 83 - EXPORT_SYMBOL(ceph_flags_to_mode); 84 85 85 86 int ceph_caps_for_mode(int mode) 86 87 { ··· 98 101 99 102 return caps; 100 103 } 101 - EXPORT_SYMBOL(ceph_caps_for_mode);