mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 13:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2x00t: Merge r7475 and r7476 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7477 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-09-26 03:54:46 +00:00
parent ae2b9dc782
commit c707d09349
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qla2x00t/qla2x00-target/qla2x00t.c
View File

@@ -1256,7 +1256,7 @@ retry:
}
}
kfree(pmap);
vfree(pmap);
if (!found) {
res = false;

2
qla2x00t/qla_attr.c
View File

@@ -409,7 +409,7 @@ qla2x00_show_port_database(struct device *dev,
}
}
kfree(pmap);
vfree(pmap);
}
next:

7
qla2x00t/qla_mbx.c
View File

@@ -9,6 +9,7 @@
#include "qla2x_tgt.h"
#include <linux/delay.h>
#include <linux/vmalloc.h>
/*
@@ -1312,8 +1313,8 @@ out:
#ifdef CONFIG_SCSI_QLA2XXX_TARGET
/*
* qla2x00_get_node_name_list
* Issue get node name list mailbox command, kmalloc()
* and return the resulting list. Caller must kfree() it!
* Issue get node name list mailbox command, vmalloc()
* and return the resulting list. Caller must vfree() it!
*
* Input:
* ha = adapter state pointer.
@@ -1385,7 +1386,7 @@ qla2x00_get_node_name_list(scsi_qla_host_t *vha, bool include_initiators,
left = 0;
list = kzalloc(dma_size, GFP_KERNEL);
list = vmalloc(dma_size);
if (list == NULL) {
printk(KERN_ERR "%s(%ld): failed to allocate node names"
" list structure.\n", __func__, vha->host_no);