aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_aux.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
commit9a79b2274186fade17134929d4f85b70d59a3840 (patch)
treed74e9ecc83ef617166445501b49087726595fb63 /drivers/s390/scsi/zfcp_aux.c
parent75473c1d3930896bbabcc99bb58fafd53ef42473 (diff)
parent20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff)
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
-rw-r--r--drivers/s390/scsi/zfcp_aux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index a1db95925138..9726261c367d 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -259,21 +259,21 @@ zfcp_module_init(void)
259 size = sizeof(struct zfcp_fsf_req_qtcb); 259 size = sizeof(struct zfcp_fsf_req_qtcb);
260 align = calc_alignment(size); 260 align = calc_alignment(size);
261 zfcp_data.fsf_req_qtcb_cache = 261 zfcp_data.fsf_req_qtcb_cache =
262 kmem_cache_create("zfcp_fsf", size, align, 0, NULL, NULL); 262 kmem_cache_create("zfcp_fsf", size, align, 0, NULL);
263 if (!zfcp_data.fsf_req_qtcb_cache) 263 if (!zfcp_data.fsf_req_qtcb_cache)
264 goto out; 264 goto out;
265 265
266 size = sizeof(struct fsf_status_read_buffer); 266 size = sizeof(struct fsf_status_read_buffer);
267 align = calc_alignment(size); 267 align = calc_alignment(size);
268 zfcp_data.sr_buffer_cache = 268 zfcp_data.sr_buffer_cache =
269 kmem_cache_create("zfcp_sr", size, align, 0, NULL, NULL); 269 kmem_cache_create("zfcp_sr", size, align, 0, NULL);
270 if (!zfcp_data.sr_buffer_cache) 270 if (!zfcp_data.sr_buffer_cache)
271 goto out_sr_cache; 271 goto out_sr_cache;
272 272
273 size = sizeof(struct zfcp_gid_pn_data); 273 size = sizeof(struct zfcp_gid_pn_data);
274 align = calc_alignment(size); 274 align = calc_alignment(size);
275 zfcp_data.gid_pn_cache = 275 zfcp_data.gid_pn_cache =
276 kmem_cache_create("zfcp_gid", size, align, 0, NULL, NULL); 276 kmem_cache_create("zfcp_gid", size, align, 0, NULL);
277 if (!zfcp_data.gid_pn_cache) 277 if (!zfcp_data.gid_pn_cache)
278 goto out_gid_cache; 278 goto out_gid_cache;
279 279