diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:29:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:29:08 -0400 |
| commit | 0d1782144e81faf6203075c5fcd0a2f0db91af5b (patch) | |
| tree | 761dd18870e97ec9c6c14bc1c4db1429065483c0 /fs/jffs2/malloc.c | |
| parent | 67ab33db8be1cd466c09dfcba334d69d3e2f92e6 (diff) | |
| parent | c7afb0f97700e73109564f83c35bfeeb14cb653b (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[JFFS2][XATTR] Fix memory leak in POSIX-ACL support
fs/jffs2/: make 2 functions static
[MTD] NAND: Fix broken sharpsl driver
[JFFS2][XATTR] Fix xd->refcnt race condition
MTD: kernel-doc fixes + additions
MTD: fix all kernel-doc warnings
[MTD] DOC: Fixup read functions and do a little cleanup
Diffstat (limited to 'fs/jffs2/malloc.c')
| -rw-r--r-- | fs/jffs2/malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c index 8310c95478e9..33f291005012 100644 --- a/fs/jffs2/malloc.c +++ b/fs/jffs2/malloc.c | |||
| @@ -190,7 +190,7 @@ void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x) | |||
| 190 | kmem_cache_free(tmp_dnode_info_slab, x); | 190 | kmem_cache_free(tmp_dnode_info_slab, x); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | struct jffs2_raw_node_ref *jffs2_alloc_refblock(void) | 193 | static struct jffs2_raw_node_ref *jffs2_alloc_refblock(void) |
| 194 | { | 194 | { |
| 195 | struct jffs2_raw_node_ref *ret; | 195 | struct jffs2_raw_node_ref *ret; |
| 196 | 196 | ||