summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 14:20:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 14:20:53 +0200
commite33bae14fd8da449d735552d78e6dd33ece0458c (patch)
tree048c062c47f7bfdb0ea8ad19c5b5849a58ff3022 /Documentation
parent7670c7010c7b367ca40c3aba02afb36149764a6e (diff)
parent14211d026dad4641d4dffd7a4c520bcaa8fd4a65 (diff)
Merge branch 'for-linus' of git://github.com/ericvh/linux
* 'for-linus' of git://github.com/ericvh/linux: 9p: fix 9p.txt to advertise msize instead of maxdata net/9p: Convert net/9p protocol dumps to tracepoints fs/9p: change an int to unsigned int fs/9p: Cleanup option parsing in 9p 9p: move dereference after NULL check fs/9p: inode file operation is properly initialized init_special_inode fs/9p: Update zero-copy implementation in 9p
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/9p.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index 13de64c7f0ab..2c0321442845 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -92,7 +92,7 @@ OPTIONS
wfdno=n the file descriptor for writing with trans=fd
- maxdata=n the number of bytes to use for 9p packet payload (msize)
+ msize=n the number of bytes to use for 9p packet payload
port=n port to connect to on the remote server