Commit 21536062 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi class: fix endpoint id handling 



Some endpoint code was using unsigned int and some
was using uint64_t. This converts it all to uint64_t.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent e5bd7b54

drivers/scsi/scsi_transport_iscsi.c

+5 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static ssize_t 
show_ep_handle(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);

	return sprintf(buf, "%u\n", ep->id);

	return sprintf(buf, "%llu\n", (unsigned long long) ep->id);

}

static ISCSI_ATTR(ep, handle, S_IRUGO, show_ep_handle, NULL);
@@ -156,7 +156,7 @@ static struct attribute_group iscsi_endpoint_group = { 
static int iscsi_match_epid(struct device *dev, void *data)

{

	struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);

	unsigned int *epid = (unsigned int *) data;

	uint64_t *epid = (uint64_t *) data;



	return *epid == ep->id;

}
@@ -166,7 +166,7 @@ iscsi_create_endpoint(int dd_size) 
{

	struct device *dev;

	struct iscsi_endpoint *ep;

	unsigned int id;

	uint64_t id;

	int err;



	for (id = 1; id < ISCSI_MAX_EPID; id++) {
@@ -187,7 +187,8 @@ iscsi_create_endpoint(int dd_size) 


	ep->id = id;

	ep->dev.class = &iscsi_endpoint_class;

	snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%u", id);

	snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%llu",

		 (unsigned long long) id);

	err = device_register(&ep->dev);

        if (err)

                goto free_ep;

include/scsi/scsi_transport_iscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ extern void iscsi_host_for_each_session(struct Scsi_Host *shost, 
struct iscsi_endpoint {

	void *dd_data;			/* LLD private data */

	struct device dev;

	unsigned int id;

	uint64_t id;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE