kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] libiscsi: pass session failure a session struct

Browse source 
The api for conn and session failures is akward because
one takes a conn from the lib and one takes a session
from the class. This syncs up the interfaces to use
structs from the lib.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Mike Christie 2009-03-05 14:46:05 -06:00 committed by James Bottomley
parent 4d1083509a
commit 40a06e755d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/scsi/libiscsi.c
View file

@ -1069,10 +1069,9 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)
} }
EXPORT_SYMBOL_GPL(iscsi_itt_to_ctask); 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) enum iscsi_err err)
{ {
struct iscsi_session *session = cls_session->dd_data;
struct iscsi_conn *conn; struct iscsi_conn *conn;
struct device *dev; struct device *dev;
unsigned long flags; unsigned long flags;
@ -2097,7 +2096,7 @@ EXPORT_SYMBOL_GPL(iscsi_host_alloc);
static void iscsi_notify_host_removed(struct iscsi_cls_session *cls_session) 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);
} }
/** /**

2
include/scsi/libiscsi.h
View file

@ -378,7 +378,7 @@ extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);
extern int iscsi_conn_bind(struct iscsi_cls_session *, struct iscsi_cls_conn *, extern int iscsi_conn_bind(struct iscsi_cls_session *, struct iscsi_cls_conn *,
int); int);
extern void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err); 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); enum iscsi_err err);
extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn, extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
enum iscsi_param param, char *buf); enum iscsi_param param, char *buf);