From: Dmitry Torokhov <dtor_core@ameritech.net>
To: linux-kernel@vger.kernel.org
Cc: Greg KH <gregkh@suse.de>, Jean Delvare <khali@linux-fr.org>
Subject: [RFC/PATCH 1/5] sysfs: if show/store is missing return -ENOSYS
Date: Thu, 28 Apr 2005 00:31:28 -0500 [thread overview]
Message-ID: <200504280031.28816.dtor_core@ameritech.net> (raw)
In-Reply-To: <200504280030.10214.dtor_core@ameritech.net>
sysfs: if attribute does not implement show or store method
read/write should return -ENOSYS instead of 0, EACCESS
or EINVAL.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
bin.c | 4 ++--
file.c | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
Index: dtor/fs/sysfs/file.c
===================================================================
--- dtor.orig/fs/sysfs/file.c
+++ dtor/fs/sysfs/file.c
@@ -23,7 +23,7 @@ subsys_attr_show(struct kobject * kobj,
{
struct subsystem * s = to_subsys(kobj);
struct subsys_attribute * sattr = to_sattr(attr);
- ssize_t ret = 0;
+ ssize_t ret = -ENOSYS;
if (sattr->show)
ret = sattr->show(s,page);
@@ -36,7 +36,7 @@ subsys_attr_store(struct kobject * kobj,
{
struct subsystem * s = to_subsys(kobj);
struct subsys_attribute * sattr = to_sattr(attr);
- ssize_t ret = 0;
+ ssize_t ret = -ENOSYS;
if (sattr->store)
ret = sattr->store(s,page,count);
@@ -274,17 +274,17 @@ static int check_perm(struct inode * ino
* or the subsystem have no operations.
*/
if (!ops)
- goto Eaccess;
+ goto Enosys;
/* File needs write support.
* The inode's perms must say it's ok,
* and we must have a store method.
*/
if (file->f_mode & FMODE_WRITE) {
-
- if (!(inode->i_mode & S_IWUGO) || !ops->store)
+ if (!(inode->i_mode & S_IWUGO))
goto Eaccess;
-
+ if (!ops->store)
+ goto Enosys;
}
/* File needs read support.
@@ -292,8 +292,10 @@ static int check_perm(struct inode * ino
* must be a show method for it.
*/
if (file->f_mode & FMODE_READ) {
- if (!(inode->i_mode & S_IRUGO) || !ops->show)
+ if (!(inode->i_mode & S_IRUGO))
goto Eaccess;
+ if (!ops->show)
+ goto Enosys;
}
/* No error? Great, allocate a buffer for the file, and store it
@@ -313,6 +315,9 @@ static int check_perm(struct inode * ino
Einval:
error = -EINVAL;
goto Done;
+ Enosys:
+ error = -ENOSYS;
+ goto Done;
Eaccess:
error = -EACCES;
module_put(attr->owner);
Index: dtor/fs/sysfs/bin.c
===================================================================
--- dtor.orig/fs/sysfs/bin.c
+++ dtor/fs/sysfs/bin.c
@@ -25,7 +25,7 @@ fill_read(struct dentry *dentry, char *b
struct kobject * kobj = to_kobj(dentry->d_parent);
if (!attr->read)
- return -EINVAL;
+ return -ENOSYS;
return attr->read(kobj, buffer, off, count);
}
@@ -71,7 +71,7 @@ flush_write(struct dentry *dentry, char
struct kobject *kobj = to_kobj(dentry->d_parent);
if (!attr->write)
- return -EINVAL;
+ return -ENOSYS;
return attr->write(kobj, buffer, offset, count);
}
next prev parent reply other threads:[~2005-04-28 5:47 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 ` Dmitry Torokhov [this message]
2005-04-28 5:41 ` [RFC/PATCH 2/5] sysfs: (driver/base) if show/store is missing " 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 ` [PATCH 4/5 (take 2)] sysfs: (driver/block) " Dmitry Torokhov
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=200504280031.28816.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=gregkh@suse.de \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
/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.