Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index f337da7..abc4b16 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
@@ -22,16 +21,6 @@
  *
  */
 
-/*
-  * Idpool structure provides lock and id management
-  *
-  */
-
-struct v9fs_idpool {
-       struct semaphore lock;
-       struct idr pool;
-};
-
 /*
   * Session structure provides information for an opened session
   *
@@ -48,22 +37,14 @@ struct v9fs_session_info {
        unsigned int afid;      /* authentication fid */
        unsigned int rfdno;     /* read file descriptor number */
        unsigned int wfdno;     /* write file descriptor number */
-
+       unsigned int cache;     /* cache mode */
 
        char *name;             /* user name to mount as */
        char *remotename;       /* name of remote hierarchy being mounted */
        unsigned int uid;       /* default uid/muid for legacy support */
        unsigned int gid;       /* default gid for legacy support */
 
-       /* book keeping */
-       struct v9fs_idpool fidpool;     /* The FID pool for file descriptors */
-
-       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;
+       struct p9_client *clnt; /* 9p client */
        struct dentry *debugfs_dir;
 };
 
@@ -72,16 +53,21 @@ enum {
        PROTO_TCP,
        PROTO_UNIX,
        PROTO_FD,
+       PROTO_PCI,
+};
+
+/* possible values of ->cache */
+/* eventually support loose, tight, time, session, default always none */
+enum {
+       CACHE_NONE,             /* default */
+       CACHE_LOOSE,            /* no consistency */
 };
 
 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 *);
+struct p9_fid *v9fs_session_init(struct v9fs_session_info *, const char *,
+                                                                       char *);
 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
@@ -91,6 +77,7 @@ 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
+static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)
+{
+       return (inode->i_sb->s_fs_info);
+}