Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262439AbVD2G3i (ORCPT ); Fri, 29 Apr 2005 02:29:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262437AbVD2G2m (ORCPT ); Fri, 29 Apr 2005 02:28:42 -0400 Received: from smtp815.mail.sc5.yahoo.com ([66.163.170.1]:17503 "HELO smtp815.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S262438AbVD2G1o (ORCPT ); Fri, 29 Apr 2005 02:27:44 -0400 From: Dmitry Torokhov To: linux-kernel@vger.kernel.org Subject: [PATCH 3/5 (take 2)] sysfs: (driver/pci) if show/store is missing return -EIO Date: Fri, 29 Apr 2005 01:26:27 -0500 User-Agent: KMail/1.8 Cc: Robert Love , Greg KH , Jean Delvare References: <200504280030.10214.dtor_core@ameritech.net> <1114710135.6682.60.camel@betsy> <200504290122.00679.dtor_core@ameritech.net> In-Reply-To: <200504290122.00679.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200504290126.27663.dtor_core@ameritech.net> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3313 Lines: 98 sysfs: fix drivers/pci so if an attribute does not implement show or store method read/write will return -EIO instead of 0. Signed-off-by: Dmitry Torokhov --- hotplug/pci_hotplug_core.c | 4 ++-- hotplug/rpadlpar_sysfs.c | 2 +- pci-driver.c | 26 ++++++++++++++------------ 3 files changed, 17 insertions(+), 15 deletions(-) Index: dtor/drivers/pci/hotplug/rpadlpar_sysfs.c =================================================================== --- dtor.orig/drivers/pci/hotplug/rpadlpar_sysfs.c +++ dtor/drivers/pci/hotplug/rpadlpar_sysfs.c @@ -48,7 +48,7 @@ dlpar_attr_store(struct kobject * kobj, struct dlpar_io_attr *dlpar_attr = container_of(attr, struct dlpar_io_attr, attr); return dlpar_attr->store ? - dlpar_attr->store(dlpar_attr, buf, nbytes) : 0; + dlpar_attr->store(dlpar_attr, buf, nbytes) : -EIO; } static struct sysfs_ops dlpar_attr_sysfs_ops = { Index: dtor/drivers/pci/pci-driver.c =================================================================== --- dtor.orig/drivers/pci/pci-driver.c +++ dtor/drivers/pci/pci-driver.c @@ -327,13 +327,14 @@ pci_driver_attr_show(struct kobject * ko { struct device_driver *driver = kobj_to_pci_driver(kobj); struct driver_attribute *dattr = attr_to_driver_attribute(attr); - ssize_t ret = 0; + ssize_t ret; - if (get_driver(driver)) { - if (dattr->show) - ret = dattr->show(driver, buf); - put_driver(driver); - } + if (!get_driver(driver)) + return -ENODEV; + + ret = dattr->show ? dattr->show(driver, buf) : -EIO; + + put_driver(driver); return ret; } @@ -343,13 +344,14 @@ pci_driver_attr_store(struct kobject * k { struct device_driver *driver = kobj_to_pci_driver(kobj); struct driver_attribute *dattr = attr_to_driver_attribute(attr); - ssize_t ret = 0; + ssize_t ret; - if (get_driver(driver)) { - if (dattr->store) - ret = dattr->store(driver, buf, count); - put_driver(driver); - } + if (!get_driver(driver)) + return -ENODEV; + + ret = dattr->store ? dattr->store(driver, buf, count) : -EIO; + + put_driver(driver); return ret; } Index: dtor/drivers/pci/hotplug/pci_hotplug_core.c =================================================================== --- dtor.orig/drivers/pci/hotplug/pci_hotplug_core.c +++ dtor/drivers/pci/hotplug/pci_hotplug_core.c @@ -73,7 +73,7 @@ static ssize_t hotplug_slot_attr_show(st { struct hotplug_slot *slot = to_hotplug_slot(kobj); struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); - return attribute->show ? attribute->show(slot, buf) : 0; + return attribute->show ? attribute->show(slot, buf) : -EIO; } static ssize_t hotplug_slot_attr_store(struct kobject *kobj, @@ -81,7 +81,7 @@ static ssize_t hotplug_slot_attr_store(s { struct hotplug_slot *slot = to_hotplug_slot(kobj); struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); - return attribute->store ? attribute->store(slot, buf, len) : 0; + return attribute->store ? attribute->store(slot, buf, len) : -EIO; } static struct sysfs_ops hotplug_slot_sysfs_ops = { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/