From 23144c0df2f3fe261c64eb2d2815a9e46532841e Mon Sep 17 00:00:00 2001 From: Latchesar Ionkov Date: Tue, 6 Nov 2007 08:02:53 -0600 Subject: [PATCH] --- yaml --- r: 73232 b: refs/heads/master c: 8999e04f3b7930f0c6f091a541237de51d8dd372 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/9p/v9fs.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3e66a64c8607..ef31929ff3fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dda6b022f3222f09d3fb49f5dfabd31d33e0d10b +refs/heads/master: 8999e04f3b7930f0c6f091a541237de51d8dd372 diff --git a/trunk/fs/9p/v9fs.c b/trunk/fs/9p/v9fs.c index 756f7e9beb2e..fbb12dadba83 100644 --- a/trunk/fs/9p/v9fs.c +++ b/trunk/fs/9p/v9fs.c @@ -82,7 +82,7 @@ static match_table_t tokens = { static void v9fs_parse_options(struct v9fs_session_info *v9ses) { - char *options = v9ses->options; + char *options; substring_t args[MAX_OPT_ARGS]; char *p; int option; @@ -96,9 +96,10 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses) v9ses->cache = 0; v9ses->trans = v9fs_default_trans(); - if (!options) + if (!v9ses->options) return; + options = kstrdup(v9ses->options, GFP_KERNEL); while ((p = strsep(&options, ",")) != NULL) { int token; if (!*p) @@ -169,6 +170,7 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses) continue; } } + kfree(options); } /**