From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755971AbZEUA27 (ORCPT ); Wed, 20 May 2009 20:28:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755545AbZEUA2U (ORCPT ); Wed, 20 May 2009 20:28:20 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:46302 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752759AbZEUA2Q (ORCPT ); Wed, 20 May 2009 20:28:16 -0400 From: "Eric W. Biederman" To: Andrew Morton , Greg Kroah-Hartman Cc: , Tejun Heo , Cornelia Huck , , "Eric W. Biederman" , "Eric W. Biederman" Subject: [PATCH 02/20] driver core: Use sysfs_rename_link in device_rename Date: Wed, 20 May 2009 17:27:56 -0700 Message-Id: <1242865694-2100-2-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 1.6.1.2.350.g88cc In-Reply-To: <1242865694-2100-1-git-send-email-ebiederm@xmission.com> References: <1242865694-2100-1-git-send-email-ebiederm@xmission.com> X-XM-SPF: eid=;;;mid=;;;hst=in02.mta.xmission.com;;;ip=76.21.114.89;;;frm=ebiederm@xmission.com;;;spf=neutral X-SA-Exim-Connect-IP: 76.21.114.89 X-SA-Exim-Rcpt-To: akpm@linux-foundation.org, gregkh@suse.de, linux-kernel@vger.kernel.org, tj@kernel.org, cornelia.huck@de.ibm.com, linux-fsdevel@vger.kernel.org, ebiederm@xmission.com, ebiederm@aristanetworks.com X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Version: 4.2.1 (built Thu, 25 Oct 2007 00:26:12 +0000) X-SA-Exim-Scanned: No (on in02.mta.xmission.com); Unknown failure Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric W. Biederman Don't open code the renaming of symlinks in sysfs instead use the new helper function sysfs_rename_link Signed-off-by: Eric W. Biederman --- drivers/base/core.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 4aa527b..8a1569c 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1490,22 +1490,16 @@ int device_rename(struct device *dev, char *new_name) if (old_class_name) { new_class_name = make_class_name(dev->class->name, &dev->kobj); if (new_class_name) { - error = sysfs_create_link_nowarn(&dev->parent->kobj, - &dev->kobj, - new_class_name); - if (error) - goto out; - sysfs_remove_link(&dev->parent->kobj, old_class_name); + error = sysfs_rename_link(&dev->parent->kobj, + &dev->kobj, + old_class_name, + new_class_name); } } #else if (dev->class) { - error = sysfs_create_link_nowarn(&dev->class->p->class_subsys.kobj, - &dev->kobj, dev_name(dev)); - if (error) - goto out; - sysfs_remove_link(&dev->class->p->class_subsys.kobj, - old_device_name); + error = sysfs_rename_link(&dev->class->p->class_subsys.kobj, + &dev->kobj, old_device_name, new_name); } #endif -- 1.6.1.2.350.g88cc