diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-06 10:53:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-06 10:53:46 -0500 |
commit | 65d3a68af53523d4d6daeb896c93e326cf46fd85 (patch) | |
tree | b15931691edab2fb4e5465c3c14a4f159c8f25e4 /net/9p/mod.c | |
parent | 2658770b2c3570106675d2e5581f4ae727523e0a (diff) | |
parent | 55762690e2696d7b5034d85d1fbeb620841220c9 (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: add missing end-of-options record for trans_fd
9p: return NULL when trans not found
9p: use copy of the options value instead of original
9p: fix memory leak in v9fs_get_sb
Diffstat (limited to 'net/9p/mod.c')
-rw-r--r-- | net/9p/mod.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/mod.c b/net/9p/mod.c index 41d70f47375d..8f9763a9dc12 100644 --- a/net/9p/mod.c +++ b/net/9p/mod.c | |||
@@ -76,9 +76,9 @@ struct p9_trans_module *v9fs_match_trans(const substring_t *name) | |||
76 | list_for_each(p, &v9fs_trans_list) { | 76 | list_for_each(p, &v9fs_trans_list) { |
77 | t = list_entry(p, struct p9_trans_module, list); | 77 | t = list_entry(p, struct p9_trans_module, list); |
78 | if (strncmp(t->name, name->from, name->to-name->from) == 0) | 78 | if (strncmp(t->name, name->from, name->to-name->from) == 0) |
79 | break; | 79 | return t; |
80 | } | 80 | } |
81 | return t; | 81 | return NULL; |
82 | } | 82 | } |
83 | EXPORT_SYMBOL(v9fs_match_trans); | 83 | EXPORT_SYMBOL(v9fs_match_trans); |
84 | 84 | ||