Commit 17eaacee authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: add sysfs report of RAID level 



Report the RAID level string for the SCSI device representing the
array. Report is in /sys/class/scsi_device/#:#:#:#/device/level.

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 95e852e1

drivers/scsi/aacraid/aachba.c

+6 −1
Original line number Diff line number Diff line
@@ -690,7 +690,12 @@ static char *container_types[] = { 
        "Unknown"

};





char * get_container_type(unsigned tindex)

{

	if (tindex >= ARRAY_SIZE(container_types))

		tindex = ARRAY_SIZE(container_types) - 1;

	return container_types[tindex];

}



/* Function: setinqstr

 *

drivers/scsi/aacraid/aacraid.h

+1 −0
Original line number Diff line number Diff line
@@ -1869,6 +1869,7 @@ int aac_probe_container(struct aac_dev *dev, int cid); 
int _aac_rx_init(struct aac_dev *dev);

int aac_rx_select_comm(struct aac_dev *dev, int comm);

int aac_rx_deliver_producer(struct fib * fib);

char * get_container_type(unsigned type);

extern int numacb;

extern int acbsize;

extern char aac_driver_version[];

drivers/scsi/aacraid/linit.c

+25 −0
Original line number Diff line number Diff line
@@ -487,6 +487,30 @@ static int aac_change_queue_depth(struct scsi_device *sdev, int depth) 
	return sdev->queue_depth;

}



static ssize_t aac_show_raid_level(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct scsi_device * sdev = to_scsi_device(dev);

	if (sdev_channel(sdev) != CONTAINER_CHANNEL)

		return snprintf(buf, PAGE_SIZE, sdev->no_uld_attach

		  ? "Hidden\n" : "JBOD");

	return snprintf(buf, PAGE_SIZE, "%s\n",

	  get_container_type(((struct aac_dev *)(sdev->host->hostdata))

	    ->fsa_dev[sdev_id(sdev)].type));

}



static struct device_attribute aac_raid_level_attr = {

	.attr = {

		.name = "level",

		.mode = S_IRUGO,

	},

	.show = aac_show_raid_level

};



static struct device_attribute *aac_dev_attrs[] = {

	&aac_raid_level_attr,

	NULL,

};



static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg)

{

	struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
@@ -941,6 +965,7 @@ static struct scsi_host_template aac_driver_template = { 
	.shost_attrs			= aac_attrs,

	.slave_configure		= aac_slave_configure,

	.change_queue_depth		= aac_change_queue_depth,

	.sdev_attrs			= aac_dev_attrs,

	.eh_abort_handler		= aac_eh_abort,

	.eh_host_reset_handler		= aac_eh_reset,

	.can_queue      		= AAC_NUM_IO_FIB,