diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 19:30:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 19:30:51 -0700 |
| commit | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (patch) | |
| tree | 8dcdbbb7adc68647267794c4e3a4686afd94ad65 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/parser.h b/include/linux/parser.h index 26b2bdfcaf0..7dcd0507575 100644 --- a/include/linux/parser.h +++ b/include/linux/parser.h @@ -29,5 +29,5 @@ int match_token(char *, match_table_t table, substring_t args[]); int match_int(substring_t *, int *result); int match_octal(substring_t *, int *result); int match_hex(substring_t *, int *result); -void match_strcpy(char *, const substring_t *); +size_t match_strlcpy(char *, const substring_t *, size_t); char *match_strdup(const substring_t *); |