Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

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

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 820bf5ca35d88b8dd2c03ac619b88b16d8ac45c2..7d3a1018db5215ec9a410b2d789b1ea5d3e8aab5 100644 (file)
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -1,7 +1,7 @@
 /*
  * V9FS definitions.
  *
- *  Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
+ *  Copyright (C) 2004-2008 by Eric Van Hensbergen <ericvh@gmail.com>
  *  Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -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
   *
@@ -38,39 +28,30 @@ 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 *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;
+       char *options;          /* copy of mount options */
+       char *uname;            /* user name to mount as */
+       char *aname;            /* name of remote hierarchy being mounted */
+       unsigned int maxdata;   /* max data for client interface */
+       unsigned int dfltuid;   /* default uid/muid for legacy support */
+       unsigned int dfltgid;   /* default gid for legacy support */
+       u32 uid;                /* if ACCESS_SINGLE, the uid that has access */
+       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           = 0x01, /* 9P2000.u */
+       V9FS_ACCESS_MASK        = 0x06, /* access mask */
+       V9FS_ACCESS_SINGLE      = 0x02, /* only one user can access the files */
+       V9FS_ACCESS_USER        = 0x04, /* attache per user */
+       V9FS_ACCESS_ANY         = 0x06, /* use the same attach for all users */
 };
 
 /* possible values of ->cache */
@@ -82,18 +63,26 @@ 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
 
 /* other default globals */
-#define V9FS_PORT              564
+#define V9FS_PORT      564
 #define V9FS_DEFUSER   "nobody"
 #define V9FS_DEFANAME  ""
+#define V9FS_DEFUID    (-2)
+#define V9FS_DEFGID    (-2)
+
+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;
+}