Pull bsp-removal into release branch

[~andy/linux] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 52203027b1586db62a61ca3df8004a4426e7d7e1..f337da7a0eec1c4c6be93307172ba5e9f7511b70 100644 (file)
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -57,24 +57,14 @@ struct v9fs_session_info {
 
        /* book keeping */
        struct v9fs_idpool fidpool;     /* The FID pool for file descriptors */
-       struct v9fs_idpool tidpool;     /* The TID pool for transactions ids */
 
-       /* transport information */
        struct v9fs_transport *transport;
+       struct v9fs_mux_data *mux;
 
        int inprogress;         /* session in progress => true */
        int shutdown;           /* session shutting down. no more attaches. */
        unsigned char session_hung;
-
-       /* mux private data */
-       struct v9fs_fcall *curfcall;
-       wait_queue_head_t read_wait;
-       struct completion fcread;
-       struct completion proccmpl;
-       struct task_struct *recvproc;
-
-       spinlock_t muxlock;
-       struct list_head mux_fcalls;
+       struct dentry *debugfs_dir;
 };
 
 /* possible values of ->proto */
@@ -84,14 +74,15 @@ enum {
        PROTO_FD,
 };
 
+extern struct dentry *v9fs_debugfs_root;
+
 int v9fs_session_init(struct v9fs_session_info *, const char *, char *);
 struct v9fs_session_info *v9fs_inode2v9ses(struct inode *);
 void v9fs_session_close(struct v9fs_session_info *v9ses);
 int v9fs_get_idpool(struct v9fs_idpool *p);
 void v9fs_put_idpool(int id, struct v9fs_idpool *p);
-int v9fs_get_option(char *opts, char *name, char *buf, int buflen);
-long long v9fs_get_int_option(char *opts, char *name, long long dflt);
-int v9fs_parse_tcp_devname(const char *devname, char **addr, char **remotename);
+int v9fs_check_idpool(int id, struct v9fs_idpool *p);
+void v9fs_session_cancel(struct v9fs_session_info *v9ses);
 
 #define V9FS_MAGIC 0x01021997