|
@@ -4357,11 +4357,9 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
|
|
|
printk(KERN_ERR "Unable to allocate struct se_mem\n");
|
|
|
goto out;
|
|
|
}
|
|
|
- INIT_LIST_HEAD(&se_mem->se_list);
|
|
|
- se_mem->se_len = (length > dma_size) ? dma_size : length;
|
|
|
|
|
|
/* #warning FIXME Allocate contigous pages for struct se_mem elements */
|
|
|
- se_mem->se_page = (struct page *) alloc_pages(GFP_KERNEL, 0);
|
|
|
+ se_mem->se_page = alloc_pages(GFP_KERNEL, 0);
|
|
|
if (!(se_mem->se_page)) {
|
|
|
printk(KERN_ERR "alloc_pages() failed\n");
|
|
|
goto out;
|
|
@@ -4372,6 +4370,8 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
|
|
|
printk(KERN_ERR "kmap_atomic() failed\n");
|
|
|
goto out;
|
|
|
}
|
|
|
+ INIT_LIST_HEAD(&se_mem->se_list);
|
|
|
+ se_mem->se_len = (length > dma_size) ? dma_size : length;
|
|
|
memset(buf, 0, se_mem->se_len);
|
|
|
kunmap_atomic(buf, KM_IRQ0);
|
|
|
|
|
@@ -4390,6 +4390,9 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
|
|
|
|
|
|
return 0;
|
|
|
out:
|
|
|
+ if (se_mem)
|
|
|
+ __free_pages(se_mem->se_page, 0);
|
|
|
+ kmem_cache_free(se_mem_cache, se_mem);
|
|
|
return -1;
|
|
|
}
|
|
|
|