libiscsi - change iscsi_session_failure() to take iscsi_session pointer
PATCH 1/2 libiscsi - change iscsi_session_failure() to take iscsi_session pointer
[PATCH 1/2 2.6.29-rc] libiscsi - change iscsi_session_failure() to take iscsi_session pointer
From: Karen Xie <[email protected]>
change iscsi_session_failure() to take a pointer to iscsi_session instead of iscsi_cls_session.
---
drivers/scsi/libiscsi.c | 5 ++--- include/scsi/libiscsi.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/libiscsi.c +2 -3
@@ -1034,10 +1034,9 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt) }EXPORT_SYMBOL_GPL (iscsi_itt_to_ctask); -void iscsi_session_failure (struct iscsi_cls_session *cls_session, +void iscsi_session_failure (struct iscsi_session *session,enum iscsi_err err) { -struct iscsi_session *session = cls_session->dd_data;struct iscsi_conn *conn;struct device *dev;unsigned long flags;
@@ -2043,7 +2042,7 @@ EXPORT_SYMBOL_GPL(iscsi_host_alloc);static void iscsi_notify_host_removed (struct iscsi_cls_session *cls_session) { -iscsi_session_failure (cls_session,ISCSI_ERR_INVALID_HOST ); +iscsi_session_failure (cls_session->dd_data,ISCSI_ERR_INVALID_HOST ); }/**
include/scsi/libiscsi.h +1 -1
@@ -382,7 +382,7 @@ extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);extern int iscsi_conn_bind (struct iscsi_cls_session *,struct iscsi_cls_conn *,int );extern void iscsi_conn_failure (struct iscsi_conn *conn,enum iscsi_err err); -extern void iscsi_session_failure (struct iscsi_cls_session *cls_session, +extern void iscsi_session_failure (struct iscsi_session *session,enum iscsi_err err);extern int iscsi_conn_get_param (struct iscsi_cls_conn *cls_conn,enum iscsi_param param,char *buf);
Quoted 4 lines · Karen Xie
[PATCH 1/2 2.6.29-rc] libiscsi - change
iscsi_session_failure()to takeiscsi_sessionpointerFrom: Karen Xie <[email protected]>
I guess the From: got messed up. I am not sure if James cares or not.
James, I actually wrote the patch for Karen, and she has been using and testing it out with her patches so that is why/how my signed off is first but the "From:" above has her.
Quoted 4 lines
change
iscsi_session_failure()to take a pointer toiscsi_sessioninstead ofiscsi_cls_session.Signed-off-by Mike Christie<[email protected]>Signed-off-by Karen Xie <[email protected]>
James Bottomley
maintainerQuoted 7 lines · Mike Christie
Quoted 4 lines · Karen Xie
[PATCH 1/2 2.6.29-rc] libiscsi - change
iscsi_session_failure()to takeiscsi_sessionpointerFrom: Karen Xie <[email protected]>
I guess the From: got messed up. I am not sure if James cares or not.
I'll fix it, don't worry.
James