diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
| commit | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (patch) | |
| tree | 3dcaf08b5268e1602c6e6bc85870ebbc2f927856 /Documentation | |
| parent | 117636092a87a28a013a4acb5de5492645ed620f (diff) | |
| parent | 22150c4f0f02619c256f35db2f1ec912549b4ca5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: v9fs_vfs_rename incorrect clunk order
9p: fix memleak in fs/9p/v9fs.c
9p: add virtio transport
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/9p.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt index b90f537af35..bf8080640eb 100644 --- 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 |