diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 15:04:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 15:04:01 -0400 |
| commit | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (patch) | |
| tree | 3dcaf08b5268e1602c6e6bc85870ebbc2f927856 /fs/9p/v9fs.c | |
| parent | 117636092a87a28a013a4acb5de5492645ed620f (diff) | |
| parent | 22150c4f0f02619c256f35db2f1ec912549b4ca5 (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: v9fs_vfs_rename incorrect clunk order
9p: fix memleak in fs/9p/v9fs.c
9p: add virtio transport
Diffstat (limited to 'fs/9p/v9fs.c')
| -rw-r--r-- | fs/9p/v9fs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 873802de21cd..756f7e9beb2e 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c | |||
| @@ -162,6 +162,7 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses) | |||
| 162 | if (*e != '\0') | 162 | if (*e != '\0') |
| 163 | v9ses->uid = ~0; | 163 | v9ses->uid = ~0; |
| 164 | } | 164 | } |
| 165 | kfree(s); | ||
| 165 | break; | 166 | break; |
| 166 | 167 | ||
| 167 | default: | 168 | default: |