mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 06:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Cleanups

Browse Source 
- Attributes threads_num and threads_pool_type made appear only when supported



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1974 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-08-23 10:56:54 +00:00
parent f2852768a7
commit 7b59e08a27
1 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_sysfs.c
+40 -16
View File
@@ -788,7 +788,7 @@ static ssize_t scst_dev_sysfs_type_show(struct kobject *kobj,
return pos;
}
static struct kobj_attribute device_type_attr =
static struct kobj_attribute dev_type_attr =
__ATTR(type, S_IRUGO, scst_dev_sysfs_type_show, NULL);
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
@@ -808,7 +808,7 @@ static ssize_t scst_dev_sysfs_dump_prs(struct kobject *kobj,
return count;
}
static struct kobj_attribute device_dump_prs_attr =
static struct kobj_attribute dev_dump_prs_attr =
__ATTR(dump_prs, S_IWUSR, NULL, scst_dev_sysfs_dump_prs);
#endif /* defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) */
@@ -915,7 +915,7 @@ out:
return res;
}
static struct kobj_attribute device_threads_num_attr =
static struct kobj_attribute dev_threads_num_attr =
__ATTR(threads_num, S_IRUGO | S_IWUSR,
scst_dev_sysfs_threads_num_show,
scst_dev_sysfs_threads_num_store);
@@ -994,15 +994,13 @@ out:
}
static struct kobj_attribute device_threads_pool_type_attr =
static struct kobj_attribute dev_threads_pool_type_attr =
__ATTR(threads_pool_type, S_IRUGO | S_IWUSR,
scst_dev_sysfs_threads_pool_type_show,
scst_dev_sysfs_threads_pool_type_store);
static struct attribute *scst_dev_attrs[] = {
&device_type_attr.attr,
&device_threads_num_attr.attr,
&device_threads_pool_type_attr.attr,
&dev_type_attr.attr,
NULL,
};
@@ -1045,6 +1043,25 @@ int scst_devt_dev_sysfs_create(struct scst_device *dev)
goto out_err;
}
if (dev->handler->threads_num >= 0) {
res = sysfs_create_file(&dev->dev_kobj,
&dev_threads_num_attr.attr);
if (res != 0) {
PRINT_ERROR("Can't add dev attr %s for dev %s",
dev_threads_num_attr.attr.name,
dev->virt_name);
goto out_err;
}
res = sysfs_create_file(&dev->dev_kobj,
&dev_threads_pool_type_attr.attr);
if (res != 0) {
PRINT_ERROR("Can't add dev attr %s for dev %s",
dev_threads_pool_type_attr.attr.name,
dev->virt_name);
goto out_err;
}
}
pattr = dev->handler->dev_attrs;
if (pattr != NULL) {
while (*pattr != NULL) {
@@ -1087,6 +1104,13 @@ void scst_devt_dev_sysfs_del(struct scst_device *dev)
sysfs_remove_link(&dev->dev_kobj, "handler");
sysfs_remove_link(&dev->handler->devt_kobj, dev->virt_name);
if (dev->handler->threads_num >= 0) {
sysfs_remove_file(&dev->dev_kobj,
&dev_threads_num_attr.attr);
sysfs_remove_file(&dev->dev_kobj,
&dev_threads_pool_type_attr.attr);
}
out:
TRACE_EXIT();
return;
@@ -1135,10 +1159,10 @@ int scst_dev_sysfs_create(struct scst_device *dev)
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
if (dev->scsi_dev == NULL) {
res = sysfs_create_file(&dev->dev_kobj,
&device_dump_prs_attr.attr);
&dev_dump_prs_attr.attr);
if (res != 0) {
PRINT_ERROR("Can't create attr %s for dev %s",
device_dump_prs_attr.attr.name, dev->virt_name);
dev_dump_prs_attr.attr.name, dev->virt_name);
goto out_del;
}
}
@@ -3392,7 +3416,7 @@ static ssize_t scst_devt_mgmt_store(struct kobject *kobj,
const char *buf, size_t count)
{
int res;
char *buffer, *p, *pp, *device_name;
char *buffer, *p, *pp, *dev_name;
struct scst_dev_type *devt;
TRACE_ENTRY();
@@ -3415,16 +3439,16 @@ static ssize_t scst_devt_mgmt_store(struct kobject *kobj,
p = scst_get_next_lexem(&pp);
if (strcasecmp("add_device", p) == 0) {
device_name = scst_get_next_lexem(&pp);
if (*device_name == '\0') {
dev_name = scst_get_next_lexem(&pp);
if (*dev_name == '\0') {
PRINT_ERROR("%s", "Device name required");
res = -EINVAL;
goto out_free;
}
res = devt->add_device(device_name, pp);
res = devt->add_device(dev_name, pp);
} else if (strcasecmp("del_device", p) == 0) {
device_name = scst_get_next_lexem(&pp);
if (*device_name == '\0') {
dev_name = scst_get_next_lexem(&pp);
if (*dev_name == '\0') {
PRINT_ERROR("%s", "Device name required");
res = -EINVAL;
goto out_free;
@@ -3434,7 +3458,7 @@ static ssize_t scst_devt_mgmt_store(struct kobject *kobj,
if (*p != '\0')
goto out_syntax_err;
res = devt->del_device(device_name);
res = devt->del_device(dev_name);
} else if (devt->mgmt_cmd != NULL) {
scst_restore_token_str(p, pp);
res = devt->mgmt_cmd(buffer);