Commit 3134118a authored by James Bottomley's avatar James Bottomley Committed by James Bottomley

[PATCH] SCSI: Make sysfs attributes mutable

The attached patch makes the sysfs attributes a property of the host
template (I can't really see a reason why the actual attributes need to
change per host, so I think the template is the better place for them).

I've also provided helper functions to modify the attributes in the LLD
init routines.
parent 86764f78
...@@ -321,7 +321,12 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template *shost_tp, int xtr_bytes) ...@@ -321,7 +321,12 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template *shost_tp, int xtr_bytes)
shost_tp->eh_host_reset_handler == NULL) { shost_tp->eh_host_reset_handler == NULL) {
printk(KERN_ERR "ERROR: SCSI host `%s' has no error handling\nERROR: This is not a safe way to run your SCSI host\nERROR: The error handling must be added to this driver\n", shost_tp->proc_name); printk(KERN_ERR "ERROR: SCSI host `%s' has no error handling\nERROR: This is not a safe way to run your SCSI host\nERROR: The error handling must be added to this driver\n", shost_tp->proc_name);
dump_stack(); dump_stack();
} }
if(shost_tp->shost_attrs == NULL)
/* if its not set in the template, use the default */
shost_tp->shost_attrs = scsi_sysfs_shost_attrs;
if(shost_tp->sdev_attrs == NULL)
shost_tp->sdev_attrs = scsi_sysfs_sdev_attrs;
gfp_mask = GFP_KERNEL; gfp_mask = GFP_KERNEL;
if (shost_tp->unchecked_isa_dma && xtr_bytes) if (shost_tp->unchecked_isa_dma && xtr_bytes)
gfp_mask |= __GFP_DMA; gfp_mask |= __GFP_DMA;
......
...@@ -356,6 +356,16 @@ typedef struct SHT ...@@ -356,6 +356,16 @@ typedef struct SHT
* FIXME: This should probably be a value in the template */ * FIXME: This should probably be a value in the template */
#define SCSI_DEFAULT_HOST_BLOCKED 7 #define SCSI_DEFAULT_HOST_BLOCKED 7
/*
* pointer to the sysfs class properties for this host
*/
struct class_device_attribute **shost_attrs;
/*
* Pointer to the SCSI device properties for this host
*/
struct device_attribute **sdev_attrs;
} Scsi_Host_Template; } Scsi_Host_Template;
/* /*
......
...@@ -683,4 +683,9 @@ static inline Scsi_Cmnd *scsi_find_tag(Scsi_Device *SDpnt, int tag) { ...@@ -683,4 +683,9 @@ static inline Scsi_Cmnd *scsi_find_tag(Scsi_Device *SDpnt, int tag) {
int scsi_set_medium_removal(Scsi_Device *dev, char state); int scsi_set_medium_removal(Scsi_Device *dev, char state);
extern int scsi_sysfs_modify_sdev_attribute(struct device_attribute ***dev_attrs,
struct device_attribute *attr);
extern int scsi_sysfs_modify_shost_attribute(struct class_device_attribute ***class_attrs,
struct class_device_attribute *attr);
#endif /* _SCSI_H */ #endif /* _SCSI_H */
...@@ -131,4 +131,9 @@ extern void scsi_sysfs_remove_host(struct Scsi_Host *); ...@@ -131,4 +131,9 @@ extern void scsi_sysfs_remove_host(struct Scsi_Host *);
extern int scsi_sysfs_register(void); extern int scsi_sysfs_register(void);
extern void scsi_sysfs_unregister(void); extern void scsi_sysfs_unregister(void);
/* definitions for the linker default sections covering the host
* class and device attributes */
extern struct class_device_attribute *scsi_sysfs_shost_attrs[];
extern struct device_attribute *scsi_sysfs_sdev_attrs[];
#endif /* _SCSI_PRIV_H */ #endif /* _SCSI_PRIV_H */
...@@ -45,12 +45,13 @@ shost_rd_attr(cmd_per_lun, "%hd\n"); ...@@ -45,12 +45,13 @@ shost_rd_attr(cmd_per_lun, "%hd\n");
shost_rd_attr(sg_tablesize, "%hu\n"); shost_rd_attr(sg_tablesize, "%hu\n");
shost_rd_attr(unchecked_isa_dma, "%d\n"); shost_rd_attr(unchecked_isa_dma, "%d\n");
static struct class_device_attribute *const shost_attrs[] = { struct class_device_attribute *scsi_sysfs_shost_attrs[] = {
&class_device_attr_unique_id, &class_device_attr_unique_id,
&class_device_attr_host_busy, &class_device_attr_host_busy,
&class_device_attr_cmd_per_lun, &class_device_attr_cmd_per_lun,
&class_device_attr_sg_tablesize, &class_device_attr_sg_tablesize,
&class_device_attr_unchecked_isa_dma, &class_device_attr_unchecked_isa_dma,
NULL
}; };
static struct class shost_class = { static struct class shost_class = {
...@@ -243,7 +244,8 @@ store_rescan_field (struct device *dev, const char *buf, size_t count) ...@@ -243,7 +244,8 @@ store_rescan_field (struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(rescan, S_IRUGO | S_IWUSR, show_rescan_field, store_rescan_field) static DEVICE_ATTR(rescan, S_IRUGO | S_IWUSR, show_rescan_field, store_rescan_field)
static struct device_attribute * const sdev_attrs[] = { /* Default template for device attributes. May NOT be modified */
struct device_attribute *scsi_sysfs_sdev_attrs[] = {
&dev_attr_device_blocked, &dev_attr_device_blocked,
&dev_attr_queue_depth, &dev_attr_queue_depth,
&dev_attr_type, &dev_attr_type,
...@@ -254,6 +256,7 @@ static struct device_attribute * const sdev_attrs[] = { ...@@ -254,6 +256,7 @@ static struct device_attribute * const sdev_attrs[] = {
&dev_attr_rev, &dev_attr_rev,
&dev_attr_online, &dev_attr_online,
&dev_attr_rescan, &dev_attr_rescan,
NULL
}; };
static void scsi_device_release(struct device *dev) static void scsi_device_release(struct device *dev)
...@@ -287,9 +290,9 @@ int scsi_device_register(struct scsi_device *sdev) ...@@ -287,9 +290,9 @@ int scsi_device_register(struct scsi_device *sdev)
if (error) if (error)
return error; return error;
for (i = 0; !error && i < ARRAY_SIZE(sdev_attrs); i++) for (i = 0; !error && sdev->host->hostt->sdev_attrs[i] != NULL; i++)
error = device_create_file(&sdev->sdev_driverfs_dev, error = device_create_file(&sdev->sdev_driverfs_dev,
sdev_attrs[i]); sdev->host->hostt->sdev_attrs[i]);
if (error) if (error)
scsi_device_unregister(sdev); scsi_device_unregister(sdev);
...@@ -305,8 +308,8 @@ void scsi_device_unregister(struct scsi_device *sdev) ...@@ -305,8 +308,8 @@ void scsi_device_unregister(struct scsi_device *sdev)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(sdev_attrs); i++) for (i = 0; sdev->host->hostt->sdev_attrs[i] != NULL; i++)
device_remove_file(&sdev->sdev_driverfs_dev, sdev_attrs[i]); device_remove_file(&sdev->sdev_driverfs_dev, sdev->host->hostt->sdev_attrs[i]);
device_unregister(&sdev->sdev_driverfs_dev); device_unregister(&sdev->sdev_driverfs_dev);
} }
...@@ -357,9 +360,9 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost, struct device *dev) ...@@ -357,9 +360,9 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost, struct device *dev)
if (error) if (error)
goto clean_device; goto clean_device;
for (i = 0; !error && i < ARRAY_SIZE(shost_attrs); i++) for (i = 0; !error && shost->hostt->shost_attrs[i] != NULL; i++)
error = class_device_create_file(&shost->class_dev, error = class_device_create_file(&shost->class_dev,
shost_attrs[i]); shost->hostt->shost_attrs[i]);
if (error) if (error)
goto clean_class; goto clean_class;
...@@ -383,3 +386,104 @@ void scsi_sysfs_remove_host(struct Scsi_Host *shost) ...@@ -383,3 +386,104 @@ void scsi_sysfs_remove_host(struct Scsi_Host *shost)
device_del(&shost->host_gendev); device_del(&shost->host_gendev);
} }
/** scsi_sysfs_modify_shost_attribute - modify or add a host class attribute
*
* @class_attrs:host class attribute list to be added to or modified
* @attr: individual attribute to change or added
*
* returns zero if successful or error if not
**/
int scsi_sysfs_modify_shost_attribute(struct class_device_attribute ***class_attrs,
struct class_device_attribute *attr)
{
int modify = 0;
int num_attrs;
if(*class_attrs == NULL)
*class_attrs = scsi_sysfs_shost_attrs;
for(num_attrs=0; (*class_attrs)[num_attrs] != NULL; num_attrs++)
if(strcmp((*class_attrs)[num_attrs]->attr.name, attr->attr.name) == 0)
modify = num_attrs;
if(*class_attrs == scsi_sysfs_shost_attrs || !modify) {
struct class_device_attribute **tmp_attrs = kmalloc(sizeof(struct class_device_attribute)*(num_attrs + (modify ? 0 : 1)), GFP_KERNEL);
if(tmp_attrs == NULL)
return -ENOMEM;
memcpy(tmp_attrs, *class_attrs, sizeof(struct class_device_attribute)*num_attrs);
if(*class_attrs != scsi_sysfs_shost_attrs)
kfree(*class_attrs);
*class_attrs = tmp_attrs;
}
if(modify) {
/* spare the caller from having to copy things it's
* not interested in */
struct class_device_attribute *old_attr =
(*class_attrs)[modify];
/* extend permissions */
attr->attr.mode |= old_attr->attr.mode;
/* override null show/store with default */
if(attr->show == NULL)
attr->show = old_attr->show;
if(attr->store == NULL)
attr->store = old_attr->store;
(*class_attrs)[modify] = attr;
} else {
(*class_attrs)[num_attrs] = attr;
}
return 0;
}
EXPORT_SYMBOL(scsi_sysfs_modify_shost_attribute);
/** scsi_sysfs_modify_sdev_attribute - modify or add a host device attribute
*
* @dev_attrs: pointer to the attribute list to be added to or modified
* @attr: individual attribute to change or added
*
* returns zero if successful or error if not
**/
int scsi_sysfs_modify_sdev_attribute(struct device_attribute ***dev_attrs,
struct device_attribute *attr)
{
int modify = 0;
int num_attrs;
if(*dev_attrs == NULL)
*dev_attrs = scsi_sysfs_sdev_attrs;
for(num_attrs=0; (*dev_attrs)[num_attrs] != NULL; num_attrs++)
if(strcmp((*dev_attrs)[num_attrs]->attr.name, attr->attr.name) == 0)
modify = num_attrs;
if(*dev_attrs == scsi_sysfs_sdev_attrs || !modify) {
struct device_attribute **tmp_attrs = kmalloc(sizeof(struct device_attribute)*(num_attrs + (modify ? 0 : 1)), GFP_KERNEL);
if(tmp_attrs == NULL)
return -ENOMEM;
memcpy(tmp_attrs, *dev_attrs, sizeof(struct device_attribute)*num_attrs);
if(*dev_attrs != scsi_sysfs_sdev_attrs)
kfree(*dev_attrs);
*dev_attrs = tmp_attrs;
}
if(modify) {
/* spare the caller from having to copy things it's
* not interested in */
struct device_attribute *old_attr =
(*dev_attrs)[modify];
/* extend permissions */
attr->attr.mode |= old_attr->attr.mode;
/* override null show/store with default */
if(attr->show == NULL)
attr->show = old_attr->show;
if(attr->store == NULL)
attr->store = old_attr->store;
(*dev_attrs)[modify] = attr;
} else {
(*dev_attrs)[num_attrs] = attr;
}
return 0;
}
EXPORT_SYMBOL(scsi_sysfs_modify_sdev_attribute);
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