aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/malloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2/malloc.c')
-rw-r--r--fs/jffs2/malloc.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 734801145bf8..f27df015f3ec 100644
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: malloc.c,v 1.29 2005/07/27 14:16:53 dedekind Exp $ 10 * $Id: malloc.c,v 1.30 2005/09/20 14:27:34 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -97,13 +97,13 @@ struct jffs2_full_dirent *jffs2_alloc_full_dirent(int namesize)
97{ 97{
98 struct jffs2_full_dirent *ret; 98 struct jffs2_full_dirent *ret;
99 ret = kmalloc(sizeof(struct jffs2_full_dirent) + namesize, GFP_KERNEL); 99 ret = kmalloc(sizeof(struct jffs2_full_dirent) + namesize, GFP_KERNEL);
100 JFFS2_DBG_MEMALLOC("%p\n", ret); 100 dbg_memalloc("%p\n", ret);
101 return ret; 101 return ret;
102} 102}
103 103
104void jffs2_free_full_dirent(struct jffs2_full_dirent *x) 104void jffs2_free_full_dirent(struct jffs2_full_dirent *x)
105{ 105{
106 JFFS2_DBG_MEMALLOC("%p\n", x); 106 dbg_memalloc("%p\n", x);
107 kfree(x); 107 kfree(x);
108} 108}
109 109
@@ -111,13 +111,13 @@ struct jffs2_full_dnode *jffs2_alloc_full_dnode(void)
111{ 111{
112 struct jffs2_full_dnode *ret; 112 struct jffs2_full_dnode *ret;
113 ret = kmem_cache_alloc(full_dnode_slab, GFP_KERNEL); 113 ret = kmem_cache_alloc(full_dnode_slab, GFP_KERNEL);
114 JFFS2_DBG_MEMALLOC("%p\n", ret); 114 dbg_memalloc("%p\n", ret);
115 return ret; 115 return ret;
116} 116}
117 117
118void jffs2_free_full_dnode(struct jffs2_full_dnode *x) 118void jffs2_free_full_dnode(struct jffs2_full_dnode *x)
119{ 119{
120 JFFS2_DBG_MEMALLOC("%p\n", x); 120 dbg_memalloc("%p\n", x);
121 kmem_cache_free(full_dnode_slab, x); 121 kmem_cache_free(full_dnode_slab, x);
122} 122}
123 123
@@ -125,13 +125,13 @@ struct jffs2_raw_dirent *jffs2_alloc_raw_dirent(void)
125{ 125{
126 struct jffs2_raw_dirent *ret; 126 struct jffs2_raw_dirent *ret;
127 ret = kmem_cache_alloc(raw_dirent_slab, GFP_KERNEL); 127 ret = kmem_cache_alloc(raw_dirent_slab, GFP_KERNEL);
128 JFFS2_DBG_MEMALLOC("%p\n", ret); 128 dbg_memalloc("%p\n", ret);
129 return ret; 129 return ret;
130} 130}
131 131
132void jffs2_free_raw_dirent(struct jffs2_raw_dirent *x) 132void jffs2_free_raw_dirent(struct jffs2_raw_dirent *x)
133{ 133{
134 JFFS2_DBG_MEMALLOC("%p\n", x); 134 dbg_memalloc("%p\n", x);
135 kmem_cache_free(raw_dirent_slab, x); 135 kmem_cache_free(raw_dirent_slab, x);
136} 136}
137 137
@@ -139,13 +139,13 @@ struct jffs2_raw_inode *jffs2_alloc_raw_inode(void)
139{ 139{
140 struct jffs2_raw_inode *ret; 140 struct jffs2_raw_inode *ret;
141 ret = kmem_cache_alloc(raw_inode_slab, GFP_KERNEL); 141 ret = kmem_cache_alloc(raw_inode_slab, GFP_KERNEL);
142 JFFS2_DBG_MEMALLOC("%p\n", ret); 142 dbg_memalloc("%p\n", ret);
143 return ret; 143 return ret;
144} 144}
145 145
146void jffs2_free_raw_inode(struct jffs2_raw_inode *x) 146void jffs2_free_raw_inode(struct jffs2_raw_inode *x)
147{ 147{
148 JFFS2_DBG_MEMALLOC("%p\n", x); 148 dbg_memalloc("%p\n", x);
149 kmem_cache_free(raw_inode_slab, x); 149 kmem_cache_free(raw_inode_slab, x);
150} 150}
151 151
@@ -153,14 +153,14 @@ struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void)
153{ 153{
154 struct jffs2_tmp_dnode_info *ret; 154 struct jffs2_tmp_dnode_info *ret;
155 ret = kmem_cache_alloc(tmp_dnode_info_slab, GFP_KERNEL); 155 ret = kmem_cache_alloc(tmp_dnode_info_slab, GFP_KERNEL);
156 JFFS2_DBG_MEMALLOC("%p\n", 156 dbg_memalloc("%p\n",
157 ret); 157 ret);
158 return ret; 158 return ret;
159} 159}
160 160
161void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x) 161void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x)
162{ 162{
163 JFFS2_DBG_MEMALLOC("%p\n", x); 163 dbg_memalloc("%p\n", x);
164 kmem_cache_free(tmp_dnode_info_slab, x); 164 kmem_cache_free(tmp_dnode_info_slab, x);
165} 165}
166 166
@@ -168,13 +168,13 @@ struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)
168{ 168{
169 struct jffs2_raw_node_ref *ret; 169 struct jffs2_raw_node_ref *ret;
170 ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL); 170 ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL);
171 JFFS2_DBG_MEMALLOC("%p\n", ret); 171 dbg_memalloc("%p\n", ret);
172 return ret; 172 return ret;
173} 173}
174 174
175void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x) 175void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x)
176{ 176{
177 JFFS2_DBG_MEMALLOC("%p\n", x); 177 dbg_memalloc("%p\n", x);
178 kmem_cache_free(raw_node_ref_slab, x); 178 kmem_cache_free(raw_node_ref_slab, x);
179} 179}
180 180
@@ -182,13 +182,13 @@ struct jffs2_node_frag *jffs2_alloc_node_frag(void)
182{ 182{
183 struct jffs2_node_frag *ret; 183 struct jffs2_node_frag *ret;
184 ret = kmem_cache_alloc(node_frag_slab, GFP_KERNEL); 184 ret = kmem_cache_alloc(node_frag_slab, GFP_KERNEL);
185 JFFS2_DBG_MEMALLOC("%p\n", ret); 185 dbg_memalloc("%p\n", ret);
186 return ret; 186 return ret;
187} 187}
188 188
189void jffs2_free_node_frag(struct jffs2_node_frag *x) 189void jffs2_free_node_frag(struct jffs2_node_frag *x)
190{ 190{
191 JFFS2_DBG_MEMALLOC("%p\n", x); 191 dbg_memalloc("%p\n", x);
192 kmem_cache_free(node_frag_slab, x); 192 kmem_cache_free(node_frag_slab, x);
193} 193}
194 194
@@ -196,12 +196,12 @@ struct jffs2_inode_cache *jffs2_alloc_inode_cache(void)
196{ 196{
197 struct jffs2_inode_cache *ret; 197 struct jffs2_inode_cache *ret;
198 ret = kmem_cache_alloc(inode_cache_slab, GFP_KERNEL); 198 ret = kmem_cache_alloc(inode_cache_slab, GFP_KERNEL);
199 JFFS2_DBG_MEMALLOC("%p\n", ret); 199 dbg_memalloc("%p\n", ret);
200 return ret; 200 return ret;
201} 201}
202 202
203void jffs2_free_inode_cache(struct jffs2_inode_cache *x) 203void jffs2_free_inode_cache(struct jffs2_inode_cache *x)
204{ 204{
205 JFFS2_DBG_MEMALLOC("%p\n", x); 205 dbg_memalloc("%p\n", x);
206 kmem_cache_free(inode_cache_slab, x); 206 kmem_cache_free(inode_cache_slab, x);
207} 207}