diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 11:11:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 11:11:08 -0700 |
| commit | ceb804cd0f63b0e0a87b81913b66add6de03043d (patch) | |
| tree | 179d3050a8ea5fe5b8406efec64b5c391499d4d4 /include/net | |
| parent | 3474cbd11df8cdd6413781ea95bd51dd469098ff (diff) | |
| parent | f78233dd44a110c574fe760ad6f9c1e8741a0d00 (diff) | |
| download | op-kernel-dev-ceb804cd0f63b0e0a87b81913b66add6de03043d.zip op-kernel-dev-ceb804cd0f63b0e0a87b81913b66add6de03043d.tar.gz | |
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: Skip check for mandatory locks when unlocking
9p: Fixes a simple bug enabling writes beyond 2GB.
9p: Change the name of new protocol from 9p2010.L to 9p2000.L
fs/9p: re-init the wstat in readdir loop
net/9p: Add sysfs mount_tag file for virtio 9P device
net/9p: Use the tag name in the config space for identifying mount point
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/9p/client.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 52e1fff..f076dfa 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -32,13 +32,13 @@ /** enum p9_proto_versions - 9P protocol versions * @p9_proto_legacy: 9P Legacy mode, pre-9P2000.u * @p9_proto_2000u: 9P2000.u extension - * @p9_proto_2010L: 9P2010.L extension + * @p9_proto_2000L: 9P2000.L extension */ enum p9_proto_versions{ p9_proto_legacy = 0, p9_proto_2000u = 1, - p9_proto_2010L = 2, + p9_proto_2000L = 2, }; |
