From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756876AbYDUWMv (ORCPT ); Mon, 21 Apr 2008 18:12:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754309AbYDUWMn (ORCPT ); Mon, 21 Apr 2008 18:12:43 -0400 Received: from wa-out-1112.google.com ([209.85.146.181]:38339 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbYDUWMm (ORCPT ); Mon, 21 Apr 2008 18:12:42 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=QBYq3/vnnc7wD16bvWU4z5VaxnjfwkKt2+A/d0w49A8gApq4E5HQ7C4xwc5V9DtzL6Y1Bs3OvFLJpLRWUv4+0MKvORLTPAxoe/0VVRBzcioW3AEDJg56kedrB5+BiPEmNTtx/1ft0X3pLP00J4flTSN+Sm+RJC7CrsvWFazzuEk= Message-ID: Date: Mon, 21 Apr 2008 18:12:39 -0400 From: "Miles Lane" To: "Frederik Deweerdt" Subject: Re: 2.6.25-mm1 -- WARNING: at fs/sysfs/dir.c:427 sysfs_add_one+0x33/0x9a() Cc: "Andrew Morton" , LKML , "Greg KH" , "Kay Sievers" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline References: <20080421210146.GK7134@slug> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha.home.local id m3LMCuEB010412 On Mon, Apr 21, 2008 at 6:01 PM, Miles Lane wrote:>> On Mon, Apr 21, 2008 at 5:01 PM, Frederik Deweerdt wrote:> > On Mon, Apr 21, 2008 at 02:56:52PM -0400, Miles Lane wrote:> > > Is anyone interesting in following up on this?> > >> > Doesn't this> > http://linux.derkeiler.com/Mailing-Lists/Kernel/2008-04/msg06990.html> > fixes it?>> That patch seems to have some problems:> http://groups.google.com/group/linux.kernel/browse_thread/thread/a9cfeae4ce67ee8e/2118788c3c81b2f3?#2118788c3c81b2f3> Should I apply this instead or as well?>> From: Kay Sievers > Subject: sysfs: fix duplicated device number registration in /sys/dev/>> If the parent device has the same dev_t, we skip the registration> for the device number at /sys/dev.>> Cc: Dan Williams > Cc: Greg KH > Cc: Andrew Morton > Signed-off-by: Kay Sievers > --->> core.c | 17 +++++++++++------> 1 file changed, 11 insertions(+), 6 deletions(-)>> diff --git a/drivers/base/core.c b/drivers/base/core.c> index de925f8..afedadb 100644> --- a/drivers/base/core.c> +++ b/drivers/base/core.c> @@ -821,10 +821,13 @@ int device_add(struct device *dev)> if (error)> goto ueventattrError;>> - format_dev_t(devt_str, dev->devt);> - error = sysfs_create_link(kobj, &dev->kobj, devt_str);> - if (error)> - goto devtattrError;> + /* do not create /sys/dev/ entry if parent already did */> + if (!(dev->parent && dev->parent->devt == dev->devt)) {> + format_dev_t(devt_str, dev->devt);> + error = sysfs_create_link(kobj, &dev->kobj, devt_str);> + if (error)> + goto devtattrError;> + }> }>> error = device_add_class_symlinks(dev);> @@ -950,8 +953,10 @@ void device_del(struct device *dev)> if (parent)> klist_del(&dev->knode_parent);> if (MAJOR(dev->devt)) {> - format_dev_t(devt_str, dev->devt);> - sysfs_remove_link(device_to_dev_kobj(dev), devt_str);> + if (!(parent && parent->devt == dev->devt)) {> + format_dev_t(devt_str, dev->devt);> + sysfs_remove_link(device_to_dev_kobj(dev), devt_str);> + }> device_remove_file(dev, &devt_attr);> }> if (dev->class) {>> -- Applying this patch worked for me. Thanks! Miles{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I