9p: define session flags

[firefly-linux-kernel-4.4.55.git] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 820bf5ca35d88b8dd2c03ac619b88b16d8ac45c2..804b3ef8feab2cd7d1284eb18ffc006b053e5fd0 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
   *
@@ -39,38 +29,25 @@ struct v9fs_idpool {
 struct v9fs_session_info {
        /* options */
        unsigned int maxdata;
-       unsigned char extended; /* set to 1 if we are using UNIX extensions */
+       unsigned char flags;    /* session flags */
        unsigned char nodev;    /* set to 1 if no disable device mapping */
-       unsigned short port;    /* port to connect to */
        unsigned short debug;   /* debug level */
-       unsigned short proto;   /* protocol to use */
        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 *options;          /* copy of mount options */
        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_trans_module *trans; /* 9p transport */
+       struct p9_client *clnt; /* 9p client */
        struct dentry *debugfs_dir;
 };
 
-/* possible values of ->proto */
+/* session flags */
 enum {
-       PROTO_TCP,
-       PROTO_UNIX,
-       PROTO_FD,
+       V9FS_EXTENDED,
 };
 
 /* possible values of ->cache */
@@ -82,12 +59,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 +71,12 @@ 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);
+}
+
+static inline int v9fs_extended(struct v9fs_session_info *v9ses)
+{
+       return v9ses->flags & V9FS_EXTENDED;
+}