Commit 24604f7e authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent d36e0b62

fs/ceph/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

net/ceph/ceph_fs.c→fs/ceph/util.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

net/ceph/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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