All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dtor_core@ameritech.net>
To: linux-kernel@vger.kernel.org
Cc: Robert Love <rml@novell.com>, Greg KH <gregkh@suse.de>,
	Jean Delvare <khali@linux-fr.org>
Subject: [PATCH 4/5 (take 2)] sysfs: (driver/block) if show/store is missing return -EIO
Date: Fri, 29 Apr 2005 01:26:06 -0500	[thread overview]
Message-ID: <200504290126.06946.dtor_core@ameritech.net> (raw)
In-Reply-To: <200504290122.00679.dtor_core@ameritech.net>

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>
---

 as-iosched.c       |    4 ++--
 cfq-iosched.c      |    4 ++--
 deadline-iosched.c |    4 ++--
 genhd.c            |    2 +-
 ll_rw_blk.c        |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

Index: dtor/drivers/block/as-iosched.c
===================================================================
--- dtor.orig/drivers/block/as-iosched.c
+++ dtor/drivers/block/as-iosched.c
@@ -2044,7 +2044,7 @@ as_attr_show(struct kobject *kobj, struc
 	struct as_fs_entry *entry = to_as(attr);
 
 	if (!entry->show)
-		return 0;
+		return -EIO;
 
 	return entry->show(e->elevator_data, page);
 }
@@ -2057,7 +2057,7 @@ as_attr_store(struct kobject *kobj, stru
 	struct as_fs_entry *entry = to_as(attr);
 
 	if (!entry->store)
-		return -EINVAL;
+		return -EIO;
 
 	return entry->store(e->elevator_data, page, length);
 }
Index: dtor/drivers/block/cfq-iosched.c
===================================================================
--- dtor.orig/drivers/block/cfq-iosched.c
+++ dtor/drivers/block/cfq-iosched.c
@@ -1772,7 +1772,7 @@ cfq_attr_show(struct kobject *kobj, stru
 	struct cfq_fs_entry *entry = to_cfq(attr);
 
 	if (!entry->show)
-		return 0;
+		return -EIO;
 
 	return entry->show(e->elevator_data, page);
 }
@@ -1785,7 +1785,7 @@ cfq_attr_store(struct kobject *kobj, str
 	struct cfq_fs_entry *entry = to_cfq(attr);
 
 	if (!entry->store)
-		return -EINVAL;
+		return -EIO;
 
 	return entry->store(e->elevator_data, page, length);
 }
Index: dtor/drivers/block/genhd.c
===================================================================
--- dtor.orig/drivers/block/genhd.c
+++ dtor/drivers/block/genhd.c
@@ -321,7 +321,7 @@ static ssize_t disk_attr_show(struct kob
 	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);
Index: dtor/drivers/block/ll_rw_blk.c
===================================================================
--- dtor.orig/drivers/block/ll_rw_blk.c
+++ dtor/drivers/block/ll_rw_blk.c
@@ -3582,7 +3582,7 @@ queue_attr_show(struct kobject *kobj, st
 
 	q = container_of(kobj, struct request_queue, kobj);
 	if (!entry->show)
-		return 0;
+		return -EIO;
 
 	return entry->show(q, page);
 }
@@ -3596,7 +3596,7 @@ queue_attr_store(struct kobject *kobj, s
 
 	q = container_of(kobj, struct request_queue, kobj);
 	if (!entry->store)
-		return -EINVAL;
+		return -EIO;
 
 	return entry->store(q, page, length);
 }
Index: dtor/drivers/block/deadline-iosched.c
===================================================================
--- dtor.orig/drivers/block/deadline-iosched.c
+++ dtor/drivers/block/deadline-iosched.c
@@ -886,7 +886,7 @@ deadline_attr_show(struct kobject *kobj,
 	struct deadline_fs_entry *entry = to_deadline(attr);
 
 	if (!entry->show)
-		return 0;
+		return -EIO;
 
 	return entry->show(e->elevator_data, page);
 }
@@ -899,7 +899,7 @@ deadline_attr_store(struct kobject *kobj
 	struct deadline_fs_entry *entry = to_deadline(attr);
 
 	if (!entry->store)
-		return -EINVAL;
+		return -EIO;
 
 	return entry->store(e->elevator_data, page, length);
 }

  parent reply	other threads:[~2005-04-29  6:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-28  5:30 [RFC/PATCH 0/5] read/write on attribute w/o show/store should return -ENOSYS Dmitry Torokhov
2005-04-28  5:31 ` [RFC/PATCH 1/5] sysfs: if show/store is missing " Dmitry Torokhov
2005-04-28  5:41 ` [RFC/PATCH 2/5] sysfs: (driver/base) " Dmitry Torokhov
2005-04-28  5:42 ` [RFC/PATCH 3/5] sysfs: (driver/pci) " Dmitry Torokhov
2005-04-28  5:43 ` [RFC/PATCH 4/5] sysfs: (driver/block) " Dmitry Torokhov
2005-04-28  5:44 ` [RFC/PATCH 5/5] sysfs: (rest) " Dmitry Torokhov
2005-04-28 17:26 ` [RFC/PATCH 0/5] read/write on attribute w/o show/store should " Greg KH
2005-04-28 17:37   ` Chris Wright
2005-04-28 17:44     ` Robert Love
2005-04-28 17:51     ` Dmitry Torokhov
2005-04-28 19:56       ` Richard B. Johnson
2005-04-28 20:08         ` Robert Love
2005-04-28 17:42   ` Robert Love
2005-04-29  6:22     ` [PATCH 1/5 (take 2)] sysfs: if show/store is missing return -EIO Dmitry Torokhov
2005-04-29  6:23       ` [PATCH 2/5 (take 2)] sysfs: (driver/base) " Dmitry Torokhov
2005-04-29  6:26       ` Dmitry Torokhov [this message]
2005-04-29  6:26       ` [PATCH 3/5 (take 2)] sysfs: (driver/pci) " Dmitry Torokhov
2005-04-29  6:27       ` [PATCH 5/5 (take 2)] sysfs: (rest) " Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200504290126.06946.dtor_core@ameritech.net \
    --to=dtor_core@ameritech.net \
    --cc=gregkh@suse.de \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rml@novell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.