From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 20 Jun 2013 09:43:02 +0000 (+0200)
Subject: libfuse: remove channel user data
X-Git-Tag: fuse-3.0.0pre0~119
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=787fc5195b95c393e2bf6fb440a488c972c94fe4;p=qemu-gpiodev%2Flibfuse.git

libfuse: remove channel user data
---

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index d46ef86..9a16237 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1800,11 +1800,10 @@ struct fuse_chan_ops {
  * @param op channel operations
  * @param fd file descriptor of the channel
  * @param bufsize the minimal receive buffer size
- * @param data user data
  * @return the new channel object, or NULL on failure
  */
 struct fuse_chan *fuse_chan_new(struct fuse_chan_ops *op, int fd,
-				size_t bufsize, void *data);
+				size_t bufsize);
 
 /**
  * Query the file descriptor of the channel
@@ -1822,14 +1821,6 @@ int fuse_chan_fd(struct fuse_chan *ch);
  */
 size_t fuse_chan_bufsize(struct fuse_chan *ch);
 
-/**
- * Query the user data
- *
- * @param ch the channel
- * @return the user data passed to fuse_chan_new()
- */
-void *fuse_chan_data(struct fuse_chan *ch);
-
 /**
  * Query the session to which this channel is assigned
  *
diff --git a/lib/fuse_kern_chan.c b/lib/fuse_kern_chan.c
index 5f77bbf..c677c3e 100644
--- a/lib/fuse_kern_chan.c
+++ b/lib/fuse_kern_chan.c
@@ -91,5 +91,5 @@ struct fuse_chan *fuse_kern_chan_new(int fd)
 	};
 	size_t bufsize = getpagesize() + 0x1000;
 	bufsize = bufsize < MIN_BUFSIZE ? MIN_BUFSIZE : bufsize;
-	return fuse_chan_new(&op, fd, bufsize, NULL);
+	return fuse_chan_new(&op, fd, bufsize);
 }
diff --git a/lib/fuse_session.c b/lib/fuse_session.c
index ccd11c3..80bf0ea 100644
--- a/lib/fuse_session.c
+++ b/lib/fuse_session.c
@@ -23,8 +23,6 @@ struct fuse_chan {
 	int fd;
 
 	size_t bufsize;
-
-	void *data;
 };
 
 struct fuse_session *fuse_session_new(struct fuse_session_ops *op, void *data)
@@ -103,6 +101,12 @@ int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf,
 	return res;
 }
 
+int fuse_chan_clearfd(struct fuse_chan *ch)
+{
+	int fd = ch->fd;
+	ch->fd = -1;
+	return fd;
+}
 
 void fuse_session_destroy(struct fuse_session *se)
 {
@@ -141,7 +145,7 @@ void *fuse_session_data(struct fuse_session *se)
 }
 
 struct fuse_chan *fuse_chan_new(struct fuse_chan_ops *op, int fd,
-				size_t bufsize, void *data)
+				size_t bufsize)
 {
 	struct fuse_chan *ch = (struct fuse_chan *) malloc(sizeof(*ch));
 	if (ch == NULL) {
@@ -153,7 +157,6 @@ struct fuse_chan *fuse_chan_new(struct fuse_chan_ops *op, int fd,
 	ch->op = *op;
 	ch->fd = fd;
 	ch->bufsize = bufsize;
-	ch->data = data;
 
 	return ch;
 }
@@ -168,11 +171,6 @@ size_t fuse_chan_bufsize(struct fuse_chan *ch)
 	return ch->bufsize;
 }
 
-void *fuse_chan_data(struct fuse_chan *ch)
-{
-	return ch->data;
-}
-
 struct fuse_session *fuse_chan_session(struct fuse_chan *ch)
 {
 	return ch->se;
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index cfff5de..7c717f4 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -5,7 +5,6 @@ FUSE_3.0 {
 		fuse_loop;
 		fuse_loop_mt;
 		fuse_chan_bufsize;
-		fuse_chan_data;
 		fuse_chan_destroy;
 		fuse_chan_fd;
 		fuse_chan_send;