Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[powerpc.git] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 45dcef4..c134d10 100644 (file)
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -5,9 +5,8 @@
  *  Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -57,24 +56,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,11 +73,14 @@ 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_check_idpool(int id, struct v9fs_idpool *p);
 void v9fs_session_cancel(struct v9fs_session_info *v9ses);
 
 #define V9FS_MAGIC 0x01021997
@@ -98,6 +90,3 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses);
 #define V9FS_DEFUSER   "nobody"
 #define V9FS_DEFANAME  ""
 
-/* inital pool sizes for fids and tags */
-#define V9FS_START_FIDS 8192
-#define V9FS_START_TIDS 256