Commit 72e39ea7 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley

[SCSI] srp_transport: convert to use supported_mode attribute

srp transport works for target drivers without supported_mode
attribute but it would be better to use it explicitly.
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7525236d
...@@ -820,6 +820,7 @@ static struct scsi_host_template ibmvstgt_sht = { ...@@ -820,6 +820,7 @@ static struct scsi_host_template ibmvstgt_sht = {
.eh_abort_handler = ibmvstgt_eh_abort_handler, .eh_abort_handler = ibmvstgt_eh_abort_handler,
.shost_attrs = ibmvstgt_attrs, .shost_attrs = ibmvstgt_attrs,
.proc_name = TGT_NAME, .proc_name = TGT_NAME,
.supported_mode = MODE_TARGET,
}; };
static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id) static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id)
......
...@@ -222,7 +222,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost, ...@@ -222,7 +222,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
if (ids->roles == SRP_RPORT_ROLE_INITIATOR) { if (shost->active_mode & MODE_TARGET &&
ids->roles == SRP_RPORT_ROLE_INITIATOR) {
ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport, ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
rport->port_id); rport->port_id);
if (ret) { if (ret) {
...@@ -249,10 +250,11 @@ EXPORT_SYMBOL_GPL(srp_rport_add); ...@@ -249,10 +250,11 @@ EXPORT_SYMBOL_GPL(srp_rport_add);
void srp_rport_del(struct srp_rport *rport) void srp_rport_del(struct srp_rport *rport)
{ {
struct device *dev = &rport->dev; struct device *dev = &rport->dev;
struct Scsi_Host *shost = dev_to_shost(dev->parent);
if (rport->roles == SRP_RPORT_ROLE_INITIATOR) if (shost->active_mode & MODE_TARGET &&
srp_tgt_it_nexus_destroy(dev_to_shost(dev->parent), rport->roles == SRP_RPORT_ROLE_INITIATOR)
(unsigned long)rport); srp_tgt_it_nexus_destroy(shost, (unsigned long)rport);
transport_remove_device(dev); transport_remove_device(dev);
device_del(dev); device_del(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment