From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric W. Biederman" Subject: [PATCH 04/26] sysfs: sysfs_remove_dir stop checking for bogus cases. Date: Fri, 29 May 2009 13:19:14 -0700 Message-ID: <1243628376-22905-4-git-send-email-ebiederm@xmission.com> References: Cc: , Tejun Heo , Cornelia Huck , , Kay Sievers , Greg KH , "Eric W. Biederman" , "Eric W. Biederman" To: Andrew Morton , Greg Kroah-Hartman Return-path: Received: from out01.mta.xmission.com ([166.70.13.231]:41762 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763305AbZE2UTx (ORCPT ); Fri, 29 May 2009 16:19:53 -0400 In-Reply-To: Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Eric W. Biederman kobj->sd can not be NULL in sysfs_remove_dir. sysfs_remove_dir is only called from kobject_add (to clean up after failure) and from kobject_del at the end of a kobject's life. In both cases kobject_add has already called sysfs_create_dir successfully. The only writers of kobj->sd are sysfs_create_dir on sucess and sysfs_remove_dir when it clears the kobj just before deleting the directory. Which means at the time sysfs_remove_dir is called kobj->sd will be valid. Signed-off-by: Eric W. Biederman --- fs/sysfs/dir.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index b95cc07..a55e1d4 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -752,9 +752,6 @@ static void __sysfs_remove_dir(struct sysfs_dirent *dir_sd) struct sysfs_addrm_cxt acxt; struct sysfs_dirent **pos; - if (!dir_sd) - return; - pr_debug("sysfs %s: removing dir\n", dir_sd->s_name); sysfs_addrm_start(&acxt, dir_sd); pos = &dir_sd->s_dir.children; -- 1.6.3.1.54.g99dd.dirty