joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-24 04:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] iscsi class: rename iscsi_host to iscsi_cls_host

Browse Source 
This renames the iscsi_host to iscsi_cls_host to match the other
structs, because libiscsi wants to use the iscsi_host name in
the future.

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 2008-05-21 15:53:58 -05:00 committed by James Bottomley
parent d3826721b1
commit 32c6e1b9a2
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/scsi/scsi_transport_iscsi.c
View File

@ -114,13 +114,11 @@ static struct attribute_group iscsi_transport_group = {
.attrs = iscsi_transport_attrs, .attrs = iscsi_transport_attrs,
}; };
static int iscsi_setup_host(struct transport_container *tc, struct device *dev, static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
struct device *cdev) struct device *cdev)
{ {
struct Scsi_Host *shost = dev_to_shost(dev); struct Scsi_Host *shost = dev_to_shost(dev);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
memset(ihost, 0, sizeof(*ihost)); memset(ihost, 0, sizeof(*ihost));
INIT_LIST_HEAD(&ihost->sessions); INIT_LIST_HEAD(&ihost->sessions);
@ -140,7 +138,7 @@ static int iscsi_remove_host(struct transport_container *tc, struct device *dev,
struct device *cdev) struct device *cdev)
{ {
struct Scsi_Host *shost = dev_to_shost(dev); struct Scsi_Host *shost = dev_to_shost(dev);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
destroy_workqueue(ihost->scan_workq); destroy_workqueue(ihost->scan_workq);
return 0; return 0;
@ -293,7 +291,7 @@ static int iscsi_is_session_dev(const struct device *dev)
*/ */
int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time) int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time)
{ {
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
/* /*
* qla4xxx will have kicked off some session unblocks before calling * qla4xxx will have kicked off some session unblocks before calling
* scsi_scan_host, so just wait for them to complete. * scsi_scan_host, so just wait for them to complete.
@ -305,7 +303,7 @@ EXPORT_SYMBOL_GPL(iscsi_scan_finished);
static int iscsi_user_scan(struct Scsi_Host *shost, uint channel, static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
uint id, uint lun) uint id, uint lun)
{ {
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
struct iscsi_cls_session *session; struct iscsi_cls_session *session;
mutex_lock(&ihost->mutex); mutex_lock(&ihost->mutex);
@ -325,7 +323,7 @@ static void iscsi_scan_session(struct work_struct *work)
struct iscsi_cls_session *session = struct iscsi_cls_session *session =
container_of(work, struct iscsi_cls_session, scan_work); container_of(work, struct iscsi_cls_session, scan_work);
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&session->lock, flags); spin_lock_irqsave(&session->lock, flags);
@ -377,7 +375,7 @@ static void __iscsi_unblock_session(struct work_struct *work)
container_of(work, struct iscsi_cls_session, container_of(work, struct iscsi_cls_session,
unblock_work); unblock_work);
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
unsigned long flags; unsigned long flags;
/* /*
@ -445,7 +443,7 @@ static void __iscsi_unbind_session(struct work_struct *work)
container_of(work, struct iscsi_cls_session, container_of(work, struct iscsi_cls_session,
unbind_work); unbind_work);
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
/* Prevent new scans and make sure scanning is not in progress */ /* Prevent new scans and make sure scanning is not in progress */
mutex_lock(&ihost->mutex); mutex_lock(&ihost->mutex);
@ -463,7 +461,7 @@ static void __iscsi_unbind_session(struct work_struct *work)
static int iscsi_unbind_session(struct iscsi_cls_session *session) static int iscsi_unbind_session(struct iscsi_cls_session *session)
{ {
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
return queue_work(ihost->scan_workq, &session->unbind_work); return queue_work(ihost->scan_workq, &session->unbind_work);
} }
@ -505,7 +503,7 @@ EXPORT_SYMBOL_GPL(iscsi_alloc_session);
int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
{ {
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost; struct iscsi_cls_host *ihost;
unsigned long flags; unsigned long flags;
int err; int err;
@ -591,7 +589,7 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data)
void iscsi_remove_session(struct iscsi_cls_session *session) void iscsi_remove_session(struct iscsi_cls_session *session)
{ {
struct Scsi_Host *shost = iscsi_session_to_shost(session); struct Scsi_Host *shost = iscsi_session_to_shost(session);
struct iscsi_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
unsigned long flags; unsigned long flags;
int err; int err;
@ -1619,7 +1617,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
priv->t.host_attrs.ac.attrs = &priv->host_attrs[0]; priv->t.host_attrs.ac.attrs = &priv->host_attrs[0];
priv->t.host_attrs.ac.class = &iscsi_host_class.class; priv->t.host_attrs.ac.class = &iscsi_host_class.class;
priv->t.host_attrs.ac.match = iscsi_host_match; priv->t.host_attrs.ac.match = iscsi_host_match;
priv->t.host_size = sizeof(struct iscsi_host); priv->t.host_size = sizeof(struct iscsi_cls_host);
transport_container_register(&priv->t.host_attrs); transport_container_register(&priv->t.host_attrs);
SETUP_HOST_RD_ATTR(netdev, ISCSI_HOST_NETDEV_NAME); SETUP_HOST_RD_ATTR(netdev, ISCSI_HOST_NETDEV_NAME);

2
include/scsi/scsi_transport_iscsi.h
View File

@ -201,7 +201,7 @@ struct iscsi_cls_session {
#define starget_to_session(_stgt) \ #define starget_to_session(_stgt) \
iscsi_dev_to_session(_stgt->dev.parent) iscsi_dev_to_session(_stgt->dev.parent)
struct iscsi_host { struct iscsi_cls_host {
struct list_head sessions; struct list_head sessions;
atomic_t nr_scans; atomic_t nr_scans;
struct mutex mutex; struct mutex mutex;