diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-09-27 04:49:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:10 -0400 |
commit | f8314dc60ccba7e41f425048c4160dc7f63377d5 (patch) | |
tree | 4e361a6e93dc7f64da0244e5a0dfef1fface0ddb /fs/afs | |
parent | 32c2d2bc4bed61323f14f2a7d69ccbd567253d8a (diff) |
[PATCH] fs: Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to kzalloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Jffs2-bit-acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/afs')
-rw-r--r-- | fs/afs/vlocation.c | 3 | ||||
-rw-r--r-- | fs/afs/volume.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c index 331f730a1fb3..782ee7c600ca 100644 --- a/fs/afs/vlocation.c +++ b/fs/afs/vlocation.c | |||
@@ -281,11 +281,10 @@ int afs_vlocation_lookup(struct afs_cell *cell, | |||
281 | spin_unlock(&cell->vl_gylock); | 281 | spin_unlock(&cell->vl_gylock); |
282 | 282 | ||
283 | /* not in the cell's in-memory lists - create a new record */ | 283 | /* not in the cell's in-memory lists - create a new record */ |
284 | vlocation = kmalloc(sizeof(struct afs_vlocation), GFP_KERNEL); | 284 | vlocation = kzalloc(sizeof(struct afs_vlocation), GFP_KERNEL); |
285 | if (!vlocation) | 285 | if (!vlocation) |
286 | return -ENOMEM; | 286 | return -ENOMEM; |
287 | 287 | ||
288 | memset(vlocation, 0, sizeof(struct afs_vlocation)); | ||
289 | atomic_set(&vlocation->usage, 1); | 288 | atomic_set(&vlocation->usage, 1); |
290 | INIT_LIST_HEAD(&vlocation->link); | 289 | INIT_LIST_HEAD(&vlocation->link); |
291 | rwlock_init(&vlocation->lock); | 290 | rwlock_init(&vlocation->lock); |
diff --git a/fs/afs/volume.c b/fs/afs/volume.c index 0ff4b86476e3..768c6dbd323a 100644 --- a/fs/afs/volume.c +++ b/fs/afs/volume.c | |||
@@ -186,11 +186,10 @@ int afs_volume_lookup(const char *name, struct afs_cell *cell, int rwpath, | |||
186 | _debug("creating new volume record"); | 186 | _debug("creating new volume record"); |
187 | 187 | ||
188 | ret = -ENOMEM; | 188 | ret = -ENOMEM; |
189 | volume = kmalloc(sizeof(struct afs_volume), GFP_KERNEL); | 189 | volume = kzalloc(sizeof(struct afs_volume), GFP_KERNEL); |
190 | if (!volume) | 190 | if (!volume) |
191 | goto error_up; | 191 | goto error_up; |
192 | 192 | ||
193 | memset(volume, 0, sizeof(struct afs_volume)); | ||
194 | atomic_set(&volume->usage, 1); | 193 | atomic_set(&volume->usage, 1); |
195 | volume->type = type; | 194 | volume->type = type; |
196 | volume->type_force = force; | 195 | volume->type_force = force; |