* Add missing fuse_session_data to versionscript

* Make sure all global symbols are prefixed with "fuse_" or "cuse_"

* Released 2.8.0

4 files changed, 22 insertions, 20 deletions

diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c
index 128f87f..d507933 100644
--- a/lib/cuse_lowlevel.c
+++ b/lib/cuse_lowlevel.c
@@ -191,10 +191,10 @@ static int cuse_reply_init(fuse_req_t req, struct cuse_init_out *arg,
 	iov[2].iov_base = dev_info;
 	iov[2].iov_len = dev_info_len;
 
-	return send_reply_iov_nofree(req, 0, iov, 3);
+	return fuse_send_reply_iov_nofree(req, 0, iov, 3);
 }
 
-void do_cuse_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
+void cuse_lowlevel_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
 {
 	struct fuse_init_in *arg = (struct fuse_init_in *) inarg;
 	struct cuse_init_out outarg;
@@ -260,7 +260,7 @@ void do_cuse_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
 	if (clop->init_done)
 		clop->init_done(f->userdata);
 
-	free_req(req);
+	fuse_free_req(req);
 }
 
 struct fuse_session *cuse_lowlevel_setup(int argc, char *argv[],
diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index 2d3790a..7b99125 100644
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -83,9 +83,9 @@ void fuse_kern_unmount_compat22(const char *mountpoint);
 void fuse_kern_unmount(const char *mountpoint, int fd);
 int fuse_kern_mount(const char *mountpoint, struct fuse_args *args);
 
-int send_reply_iov(fuse_req_t req, int error, struct iovec *iov, int count);
-int send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov, int count);
-void free_req(fuse_req_t req);
+int fuse_send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
+			       int count);
+void fuse_free_req(fuse_req_t req);
 
 
 struct fuse *fuse_setup_common(int argc, char *argv[],
@@ -97,4 +97,4 @@ struct fuse *fuse_setup_common(int argc, char *argv[],
 			       void *user_data,
 			       int compat);
 
-void do_cuse_init(fuse_req_t req, fuse_ino_t nodeide, const void *inarg);
+void cuse_lowlevel_init(fuse_req_t req, fuse_ino_t nodeide, const void *inarg);
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index c0347b3..7385de1 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -100,7 +100,7 @@ static void destroy_req(fuse_req_t req)
 	free(req);
 }
 
-void free_req(fuse_req_t req)
+void fuse_free_req(fuse_req_t req)
 {
 	int ctr;
 	struct fuse_ll *f = req->f;
@@ -115,8 +115,8 @@ void free_req(fuse_req_t req)
 		destroy_req(req);
 }
 
-int send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
-			  int count)
+int fuse_send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
+			       int count)
 {
 	struct fuse_out_header out;
 
@@ -147,12 +147,13 @@ int send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
 	return fuse_chan_send(req->ch, iov, count);
 }
 
-int send_reply_iov(fuse_req_t req, int error, struct iovec *iov, int count)
+static int send_reply_iov(fuse_req_t req, int error, struct iovec *iov,
+			  int count)
 {
 	int res;
 
-	res = send_reply_iov_nofree(req, error, iov, count);
-	free_req(req);
+	res = fuse_send_reply_iov_nofree(req, error, iov, count);
+	fuse_free_req(req);
 	return res;
 }
 
@@ -250,7 +251,7 @@ int fuse_reply_err(fuse_req_t req, int err)
 void fuse_reply_none(fuse_req_t req)
 {
 	fuse_chan_send(req->ch, NULL, 0);
-	free_req(req);
+	fuse_free_req(req);
 }
 
 static unsigned long calc_timeout_sec(double t)
@@ -1435,7 +1436,7 @@ static struct {
 	[FUSE_IOCTL]	   = { do_ioctl,       "IOCTL"	     },
 	[FUSE_POLL]	   = { do_poll,        "POLL"	     },
 	[FUSE_DESTROY]	   = { do_destroy,     "DESTROY"     },
-	[CUSE_INIT]	   = { do_cuse_init,   "CUSE_INIT"   },
+	[CUSE_INIT]	   = { cuse_lowlevel_init, "CUSE_INIT"   },
 };
 
 #define FUSE_MAXOP (sizeof(fuse_ll_ops) / sizeof(fuse_ll_ops[0]))
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 4ab0291..7db299b 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -164,6 +164,10 @@ FUSE_2.8 {
 		cuse_lowlevel_teardown;
 		fuse_fs_ioctl;
 		fuse_fs_poll;
+		fuse_get_context;
+		fuse_getgroups;
+		fuse_lowlevel_notify_inval_entry;
+		fuse_lowlevel_notify_inval_inode;
 		fuse_lowlevel_notify_poll;
 		fuse_notify_poll;
 		fuse_opt_add_opt_escaped;
@@ -172,12 +176,9 @@ FUSE_2.8 {
 		fuse_reply_ioctl_iov;
 		fuse_reply_ioctl_retry;
 		fuse_reply_poll;
-		fuse_req_getgroups;
-		fuse_getgroups;
 		fuse_req_ctx;
-		fuse_get_context;
-		fuse_lowlevel_notify_inval_inode;
-		fuse_lowlevel_notify_inval_entry;
+		fuse_req_getgroups;
+		fuse_session_data;
 
 	local:
 		*;