diff options
author | Jeff Layton <jlayton@kernel.org> | 2019-04-24 12:09:04 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2019-05-07 13:22:37 -0400 |
commit | f5d7726900b66e38355db878ced6b13b00fa9201 (patch) | |
tree | a94c4b8808bb55b26f760f0f531ac54f5f4e45fe /fs | |
parent | 40e7e2c0e86464bca839cdf891bd58a6d41b60b4 (diff) |
ceph: make iterate_session_caps a public symbol
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/mds_client.c | 16 | ||||
-rw-r--r-- | fs/ceph/mds_client.h | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 5dee98b4cfde..761cb669aa13 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -1284,9 +1284,9 @@ static void cleanup_session_requests(struct ceph_mds_client *mdsc, | |||
1284 | * | 1284 | * |
1285 | * Caller must hold session s_mutex. | 1285 | * Caller must hold session s_mutex. |
1286 | */ | 1286 | */ |
1287 | static int iterate_session_caps(struct ceph_mds_session *session, | 1287 | int ceph_iterate_session_caps(struct ceph_mds_session *session, |
1288 | int (*cb)(struct inode *, struct ceph_cap *, | 1288 | int (*cb)(struct inode *, struct ceph_cap *, |
1289 | void *), void *arg) | 1289 | void *), void *arg) |
1290 | { | 1290 | { |
1291 | struct list_head *p; | 1291 | struct list_head *p; |
1292 | struct ceph_cap *cap; | 1292 | struct ceph_cap *cap; |
@@ -1451,7 +1451,7 @@ static void remove_session_caps(struct ceph_mds_session *session) | |||
1451 | LIST_HEAD(dispose); | 1451 | LIST_HEAD(dispose); |
1452 | 1452 | ||
1453 | dout("remove_session_caps on %p\n", session); | 1453 | dout("remove_session_caps on %p\n", session); |
1454 | iterate_session_caps(session, remove_session_caps_cb, fsc); | 1454 | ceph_iterate_session_caps(session, remove_session_caps_cb, fsc); |
1455 | 1455 | ||
1456 | wake_up_all(&fsc->mdsc->cap_flushing_wq); | 1456 | wake_up_all(&fsc->mdsc->cap_flushing_wq); |
1457 | 1457 | ||
@@ -1534,8 +1534,8 @@ static int wake_up_session_cb(struct inode *inode, struct ceph_cap *cap, | |||
1534 | static void wake_up_session_caps(struct ceph_mds_session *session, int ev) | 1534 | static void wake_up_session_caps(struct ceph_mds_session *session, int ev) |
1535 | { | 1535 | { |
1536 | dout("wake_up_session_caps %p mds%d\n", session, session->s_mds); | 1536 | dout("wake_up_session_caps %p mds%d\n", session, session->s_mds); |
1537 | iterate_session_caps(session, wake_up_session_cb, | 1537 | ceph_iterate_session_caps(session, wake_up_session_cb, |
1538 | (void *)(unsigned long)ev); | 1538 | (void *)(unsigned long)ev); |
1539 | } | 1539 | } |
1540 | 1540 | ||
1541 | /* | 1541 | /* |
@@ -1768,7 +1768,7 @@ int ceph_trim_caps(struct ceph_mds_client *mdsc, | |||
1768 | session->s_mds, session->s_nr_caps, max_caps, trim_caps); | 1768 | session->s_mds, session->s_nr_caps, max_caps, trim_caps); |
1769 | if (trim_caps > 0) { | 1769 | if (trim_caps > 0) { |
1770 | session->s_trim_caps = trim_caps; | 1770 | session->s_trim_caps = trim_caps; |
1771 | iterate_session_caps(session, trim_caps_cb, session); | 1771 | ceph_iterate_session_caps(session, trim_caps_cb, session); |
1772 | dout("trim_caps mds%d done: %d / %d, trimmed %d\n", | 1772 | dout("trim_caps mds%d done: %d / %d, trimmed %d\n", |
1773 | session->s_mds, session->s_nr_caps, max_caps, | 1773 | session->s_mds, session->s_nr_caps, max_caps, |
1774 | trim_caps - session->s_trim_caps); | 1774 | trim_caps - session->s_trim_caps); |
@@ -3642,7 +3642,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, | |||
3642 | recon_state.msg_version = 2; | 3642 | recon_state.msg_version = 2; |
3643 | } | 3643 | } |
3644 | /* trsaverse this session's caps */ | 3644 | /* trsaverse this session's caps */ |
3645 | err = iterate_session_caps(session, encode_caps_cb, &recon_state); | 3645 | err = ceph_iterate_session_caps(session, encode_caps_cb, &recon_state); |
3646 | 3646 | ||
3647 | spin_lock(&session->s_cap_lock); | 3647 | spin_lock(&session->s_cap_lock); |
3648 | session->s_cap_reconnect = 0; | 3648 | session->s_cap_reconnect = 0; |
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 3f0029aa8a39..0d1f673a5689 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h | |||
@@ -486,6 +486,10 @@ extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc, | |||
486 | struct ceph_mds_session *session); | 486 | struct ceph_mds_session *session); |
487 | extern void ceph_queue_cap_reclaim_work(struct ceph_mds_client *mdsc); | 487 | extern void ceph_queue_cap_reclaim_work(struct ceph_mds_client *mdsc); |
488 | extern void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr); | 488 | extern void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr); |
489 | extern int ceph_iterate_session_caps(struct ceph_mds_session *session, | ||
490 | int (*cb)(struct inode *, | ||
491 | struct ceph_cap *, void *), | ||
492 | void *arg); | ||
489 | extern void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc); | 493 | extern void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc); |
490 | 494 | ||
491 | extern char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base, | 495 | extern char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base, |