From: Jeff Layton <jlayton@kernel.org>
To: ceph-devel@vger.kernel.org
Cc: idridryomov@gmail.com, sage@redhat.com, zyan@redhat.com
Subject: [RFC PATCH v3 01/10] ceph: move net/ceph/ceph_fs.c to fs/ceph/util.c
Date: Tue, 21 Jan 2020 14:29:19 -0500 [thread overview]
Message-ID: <20200121192928.469316-2-jlayton@kernel.org> (raw)
In-Reply-To: <20200121192928.469316-1-jlayton@kernel.org>
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>
---
fs/ceph/Makefile | 2 +-
net/ceph/ceph_fs.c => fs/ceph/util.c | 4 ----
net/ceph/Makefile | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
rename net/ceph/ceph_fs.c => fs/ceph/util.c (94%)
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
similarity index 94%
rename from net/ceph/ceph_fs.c
rename to 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
--
2.24.1
next prev parent reply other threads:[~2020-01-21 19:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 19:29 [RFC PATCH v3 00/10] ceph: asynchronous file create support Jeff Layton
2020-01-21 19:29 ` Jeff Layton [this message]
2020-01-24 19:04 ` [RFC PATCH v3 01/10] ceph: move net/ceph/ceph_fs.c to fs/ceph/util.c Jeff Layton
2020-01-25 8:08 ` Ilya Dryomov
2020-01-21 19:29 ` [RFC PATCH v3 02/10] ceph: make ceph_fill_inode non-static Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 03/10] ceph: make dentry_lease_is_valid non-static Jeff Layton
2020-01-22 7:20 ` Yan, Zheng
2020-01-22 11:26 ` Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 04/10] ceph: make __take_cap_refs non-static Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 05/10] ceph: decode interval_sets for delegated inos Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 06/10] ceph: add flag to designate that a request is asynchronous Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 07/10] ceph: add infrastructure for waiting for async create to complete Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 08/10] ceph: add new MDS req field to hold delegated inode number Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 09/10] ceph: cache layout in parent dir on first sync create Jeff Layton
2020-01-21 19:29 ` [RFC PATCH v3 10/10] ceph: attempt to do async create when possible Jeff Layton
2020-01-22 7:29 ` [RFC PATCH v3 00/10] ceph: asynchronous file create support Yan, Zheng
2020-01-22 17:04 ` Yan, Zheng
2020-01-24 17:19 ` Jeff Layton
2020-01-25 1:58 ` Yan, Zheng
2020-01-25 1:58 ` Yan, Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200121192928.469316-2-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=idridryomov@gmail.com \
--cc=sage@redhat.com \
--cc=zyan@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.