Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758134AbXHPUNS (ORCPT ); Thu, 16 Aug 2007 16:13:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752176AbXHPUNJ (ORCPT ); Thu, 16 Aug 2007 16:13:09 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:45020 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750910AbXHPUNI (ORCPT ); Thu, 16 Aug 2007 16:13:08 -0400 Date: Thu, 16 Aug 2007 16:13:06 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Greg KH , Andrew Morton cc: Tejun Heo , Kernel development list Subject: [PATCH] sysfs: don't warn on removal of a nonexistent binary file Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1371 Lines: 42 This patch (as960) removes the error message and stack dump logged by sysfs_remove_bin_file() when someone tries to remove a nonexistent file. The warning doesn't seem to be needed, since none of the other file-, symlink-, or directory-removal routines in sysfs complain in a comparable way. Signed-off-by: Alan Stern --- This is 2.6.23 material. The spurious error message can be triggered by USB code added since 2.6.22, so it needs to be removed before the final release. Alan Stern Index: usb-2.6/fs/sysfs/bin.c =================================================================== --- usb-2.6.orig/fs/sysfs/bin.c +++ usb-2.6/fs/sysfs/bin.c @@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr) { - if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) { - printk(KERN_ERR "%s: " - "bad dentry or inode or no such file: \"%s\"\n", - __FUNCTION__, attr->attr.name); - dump_stack(); - } + sysfs_hash_and_remove(kobj->sd, attr->attr.name); } EXPORT_SYMBOL_GPL(sysfs_create_bin_file); - 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/