lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] libiscsi_tcp: fix LLD data allocation

Browse Source 
Have libiscsi_tcp have upper layers allocate the LLD data
along with the iscsi_cls_conn struct, so it is refcounted.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Mike Christie
2011-06-24 15:11:55 -05:00
committed by James Bottomley
parent 03adb5f912
commit 74dcd0ec73
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/libiscsi_tcp.c
View File

@@ -1084,7 +1084,8 @@ iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size,
struct iscsi_cls_conn *cls_conn; struct iscsi_cls_conn *cls_conn;
struct iscsi_tcp_conn *tcp_conn; struct iscsi_tcp_conn *tcp_conn;
cls_conn = iscsi_conn_setup(cls_session, sizeof(*tcp_conn), conn_idx); cls_conn = iscsi_conn_setup(cls_session,
sizeof(*tcp_conn) + dd_data_size, conn_idx);
if (!cls_conn) if (!cls_conn)
return NULL; return NULL;
conn = cls_conn->dd_data; conn = cls_conn->dd_data;
@@ -1096,22 +1097,13 @@ iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size,
tcp_conn = conn->dd_data; tcp_conn = conn->dd_data;
tcp_conn->iscsi_conn = conn; tcp_conn->iscsi_conn = conn;
tcp_conn->dd_data = conn->dd_data + sizeof(*tcp_conn);
tcp_conn->dd_data = kzalloc(dd_data_size, GFP_KERNEL);
if (!tcp_conn->dd_data) {
iscsi_conn_teardown(cls_conn);
return NULL;
}
return cls_conn; return cls_conn;
} }
EXPORT_SYMBOL_GPL(iscsi_tcp_conn_setup); EXPORT_SYMBOL_GPL(iscsi_tcp_conn_setup);
void iscsi_tcp_conn_teardown(struct iscsi_cls_conn *cls_conn) void iscsi_tcp_conn_teardown(struct iscsi_cls_conn *cls_conn)
{ {
struct iscsi_conn *conn = cls_conn->dd_data;
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
kfree(tcp_conn->dd_data);
iscsi_conn_teardown(cls_conn); iscsi_conn_teardown(cls_conn);
} }
EXPORT_SYMBOL_GPL(iscsi_tcp_conn_teardown); EXPORT_SYMBOL_GPL(iscsi_tcp_conn_teardown);