[TCP]: secure_tcp_sequence_number() should not use a too fast clock

[linux-2.6] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 820bf5ca35d88b8dd2c03ac619b88b16d8ac45c2..abc4b1668acef49513feb28c034e929206128cbf 100644 (file)
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -21,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
   *
@@ -54,15 +44,7 @@ struct v9fs_session_info {
        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;
 };
 
@@ -71,6 +53,7 @@ enum {
        PROTO_TCP,
        PROTO_UNIX,
        PROTO_FD,
+       PROTO_PCI,
 };
 
 /* possible values of ->cache */
@@ -82,12 +65,9 @@ enum {
 
 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
@@ -97,3 +77,7 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses);
 #define V9FS_DEFUSER   "nobody"
 #define V9FS_DEFANAME  ""
 
+static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)
+{
+       return (inode->i_sb->s_fs_info);
+}