diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 22:30:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 22:30:51 -0400 |
| commit | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (patch) | |
| tree | 8dcdbbb7adc68647267794c4e3a4686afd94ad65 /fs/9p/vfs_addr.c | |
| parent | 8978a318837d7acefca82645017c0534aeba5a36 (diff) | |
| parent | 887b3ece65be7b643dfdae0d433c91a26a3f437d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix error path during early mount
9p: make cryptic unknown error from server less scary
9p: fix flags length in net
9p: Correct fidpool creation failure in p9_client_create
9p: use struct mutex instead of struct semaphore
9p: propagate parse_option changes to client and transports
fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure.
9p: Documentation updates
add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust
Diffstat (limited to 'fs/9p/vfs_addr.c')
| -rw-r--r-- | fs/9p/vfs_addr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 6248f0e727a3..97d3aed57983 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | /** | 43 | /** |
| 44 | * v9fs_vfs_readpage - read an entire page in from 9P | 44 | * v9fs_vfs_readpage - read an entire page in from 9P |
| 45 | * | 45 | * |
| 46 | * @file: file being read | 46 | * @filp: file being read |
| 47 | * @page: structure to page | 47 | * @page: structure to page |
| 48 | * | 48 | * |
| 49 | */ | 49 | */ |