Skip to content

Commit

Permalink
[PATCH] sysfs: (driver/block) if show/store is missing return -EIO
Browse files Browse the repository at this point in the history
sysfs: fix drivers/block so if an attribute doesn't implement
       show or store method read/write will return -EIO
       instead of 0 or -EINVAL.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Dmitry Torokhov authored and Greg Kroah-Hartman committed Jun 20, 2005
1 parent fc7e482 commit 6c1852a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/block/as-iosched.c
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,7 @@ as_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
struct as_fs_entry *entry = to_as(attr);

if (!entry->show)
return 0;
return -EIO;

return entry->show(e->elevator_data, page);
}
Expand All @@ -2057,7 +2057,7 @@ as_attr_store(struct kobject *kobj, struct attribute *attr,
struct as_fs_entry *entry = to_as(attr);

if (!entry->store)
return -EINVAL;
return -EIO;

return entry->store(e->elevator_data, page, length);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/cfq-iosched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ cfq_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
struct cfq_fs_entry *entry = to_cfq(attr);

if (!entry->show)
return 0;
return -EIO;

return entry->show(e->elevator_data, page);
}
Expand All @@ -1788,7 +1788,7 @@ cfq_attr_store(struct kobject *kobj, struct attribute *attr,
struct cfq_fs_entry *entry = to_cfq(attr);

if (!entry->store)
return -EINVAL;
return -EIO;

return entry->store(e->elevator_data, page, length);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/deadline-iosched.c
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ deadline_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
struct deadline_fs_entry *entry = to_deadline(attr);

if (!entry->show)
return 0;
return -EIO;

return entry->show(e->elevator_data, page);
}
Expand All @@ -899,7 +899,7 @@ deadline_attr_store(struct kobject *kobj, struct attribute *attr,
struct deadline_fs_entry *entry = to_deadline(attr);

if (!entry->store)
return -EINVAL;
return -EIO;

return entry->store(e->elevator_data, page, length);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr,
struct gendisk *disk = to_disk(kobj);
struct disk_attribute *disk_attr =
container_of(attr,struct disk_attribute,attr);
ssize_t ret = 0;
ssize_t ret = -EIO;

if (disk_attr->show)
ret = disk_attr->show(disk,page);
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/ll_rw_blk.c
Original file line number Diff line number Diff line change
Expand Up @@ -3574,7 +3574,7 @@ queue_attr_show(struct kobject *kobj, struct attribute *attr, char *page)

q = container_of(kobj, struct request_queue, kobj);
if (!entry->show)
return 0;
return -EIO;

return entry->show(q, page);
}
Expand All @@ -3588,7 +3588,7 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,

q = container_of(kobj, struct request_queue, kobj);
if (!entry->store)
return -EINVAL;
return -EIO;

return entry->store(q, page, length);
}
Expand Down

0 comments on commit 6c1852a

Please sign in to comment.