Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[safe/jmp/linux-2.6] / Documentation / filesystems / 9p.txt

diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index cda6905..bf80806 100644 (file)
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -35,17 +35,19 @@ For remote file server:
 
 For Plan 9 From User Space applications (http://swtch.com/plan9)
 
-       mount -t 9p `namespace`/acme /mnt/9 -o proto=unix,uname=$USER
+       mount -t 9p `namespace`/acme /mnt/9 -o trans=unix,uname=$USER
 
 OPTIONS
 =======
 
-  proto=name   select an alternative transport.  Valid options are
+  trans=name   select an alternative transport.  Valid options are
                currently:
-                       unix - specifying a named pipe mount point
-                       tcp  - specifying a normal TCP/IP connection
-                       fd   - used passed file descriptors for connection
+                       unix    - specifying a named pipe mount point
+                       tcp     - specifying a normal TCP/IP connection
+                       fd      - used passed file descriptors for connection
                                 (see rfdno and wfdno)
+                       virtio  - connect to the next virtio channel available
+                               (from lguest or KVM with trans_virtio module)
 
   uname=name   user name to attempt mount as on the remote server.  The
                server may override or ignore this value.  Certain user
@@ -54,7 +56,7 @@ OPTIONS
   aname=name   aname specifies the file tree to access when the server is
                offering several exported file systems.
 
-  cache=mode   specifies a cacheing policy.  By default, no caches are used.
+  cache=mode   specifies a caching policy.  By default, no caches are used.
                        loose = no attempts are made at consistency,
                                 intended for exclusive, read-only mounts
 
@@ -68,9 +70,9 @@ OPTIONS
                        0x40 = display transport debug
                        0x80 = display allocation debug
 
-  rfdno=n      the file descriptor for reading with proto=fd
+  rfdno=n      the file descriptor for reading with trans=fd
 
-  wfdno=n      the file descriptor for writing with proto=fd
+  wfdno=n      the file descriptor for writing with trans=fd
 
   maxdata=n    the number of bytes to use for 9p packet payload (msize)
 
@@ -78,9 +80,9 @@ OPTIONS
 
   noextend     force legacy mode (no 9p2000.u semantics)
 
-  uid          attempt to mount as a particular uid
+  dfltuid      attempt to mount as a particular uid
 
-  gid          attempt to mount with a particular gid
+  dfltgid      attempt to mount with a particular gid
 
   afid         security channel - used by Plan 9 authentication protocols
 
@@ -88,6 +90,16 @@ OPTIONS
                This can be used to share devices/named pipes/sockets between
                hosts.  This functionality will be expanded in later versions.
 
+  access       there are three access modes.
+                       user  = if a user tries to access a file on v9fs
+                               filesystem for the first time, v9fs sends an
+                               attach command (Tattach) for that user.
+                               This is the default mode.
+                       <uid> = allows only user with uid=<uid> to access
+                               the files on the mounted filesystem
+                       any   = v9fs does single attach and performs all
+                               operations as one user
+
 RESOURCES
 =========