Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26

[mirror_ubuntu-bionic-kernel.git] / Documentation / filesystems / 9p.txt

diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index e694cd1b52cf9ec7bc23df86b224d3ba8f53ba8f..bf8080640eba405d01aac5a101623e825b542d90 100644 (file)
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -42,10 +42,12 @@ OPTIONS
 
   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
 
@@ -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
 =========