diff mbox

[nfs-ganesha,RFC,v2,04/13] SAL: make some rados_kv symbols public

Message ID 20180503185803.25417-5-jlayton@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jeff Layton May 3, 2018, 6:57 p.m. UTC 
From: Jeff Layton <jlayton@redhat.com>

Change-Id: I3b3bcf6bf1c1100bc6a261030a0e93094a93b27e
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 src/SAL/recovery/recovery_rados.h    | 6 ++++++
 src/SAL/recovery/recovery_rados_kv.c | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/src/SAL/recovery/recovery_rados.h b/src/SAL/recovery/recovery_rados.h
index 6c068b7fb893..f15c88463845 100644
--- a/src/SAL/recovery/recovery_rados.h
+++ b/src/SAL/recovery/recovery_rados.h
@@ -28,6 +28,7 @@ 
 extern rados_t		rados_recov_cluster;
 extern rados_ioctx_t	rados_recov_io_ctx;
 extern char		rados_recov_oid[NI_MAXHOST + 6];
+extern char		rados_recov_old_oid[NI_MAXHOST + 4];
 
 struct rados_kv_parameter {
 	/** Connection to ceph cluster */
@@ -51,10 +52,15 @@  typedef void (*pop_clid_entry_t)(char *, char *, struct pop_args *);
 int rados_kv_connect(rados_ioctx_t *io_ctx, const char *userid,
 			const char *conf, const char *pool);
 void rados_kv_shutdown(void);
+int rados_kv_put(char *key, char *val, char *object);
 int rados_kv_get(char *key, char *val, char *object);
+void rados_kv_add_clid(nfs_client_id_t *clientid);
+void rados_kv_rm_clid(nfs_client_id_t *clientid);
+void rados_kv_add_revoke_fh(nfs_client_id_t *delr_clid, nfs_fh4 *delr_handle);
 void rados_kv_create_key(nfs_client_id_t *clientid, char *key);
 void rados_kv_create_val(nfs_client_id_t *clientid, char *val);
 int rados_kv_traverse(pop_clid_entry_t callback, struct pop_args *args,
 			const char *object);
 void rados_kv_add_revoke_fh(nfs_client_id_t *delr_clid, nfs_fh4 *delr_handle);
+void rados_kv_pop_clid_entry(char *key, char *val, struct pop_args *pop_args);
 #endif	/* _RECOVERY_RADOS_H */
diff --git a/src/SAL/recovery/recovery_rados_kv.c b/src/SAL/recovery/recovery_rados_kv.c
index e3ca628f80f7..daa6a9c8f6c7 100644
--- a/src/SAL/recovery/recovery_rados_kv.c
+++ b/src/SAL/recovery/recovery_rados_kv.c
@@ -21,7 +21,7 @@ 
 static rados_t clnt;
 rados_ioctx_t rados_recov_io_ctx;
 char rados_recov_oid[NI_MAXHOST + 6];
-static char rados_recov_old_oid[NI_MAXHOST + 4];
+char rados_recov_old_oid[NI_MAXHOST + 4];
 
 struct rados_kv_parameter rados_kv_param;
 
@@ -131,7 +131,7 @@  void rados_kv_create_val(nfs_client_id_t *clientid, char *val)
 	LogDebug(COMPONENT_CLIENTID, "Created client name [%s]", val);
 }
 
-static int rados_kv_put(char *key, char *val, char *object)
+int rados_kv_put(char *key, char *val, char *object)
 {
 	int ret;
 	char *keys[1];
@@ -448,8 +448,7 @@  void rados_kv_rm_clid(nfs_client_id_t *clientid)
 	clientid->cid_recov_tag = NULL;
 }
 
-static void rados_kv_pop_clid_entry(char *key, char *val,
-				    struct pop_args *pop_args)
+void rados_kv_pop_clid_entry(char *key, char *val, struct pop_args *pop_args)
 {
 	int ret;
 	char *dupval;