From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756584AbZEUA2e (ORCPT ); Wed, 20 May 2009 20:28:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754618AbZEUA2R (ORCPT ); Wed, 20 May 2009 20:28:17 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:46295 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752452AbZEUA2Q (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" , Benjamin Thery , Daniel Lezcano , "Eric W. Biederman" Subject: [PATCH 01/20] sysfs: Implement sysfs_rename_link Date: Wed, 20 May 2009 17:27:55 -0700 Message-Id: <1242865694-2100-1-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 1.6.1.2.350.g88cc In-Reply-To: References: X-XM-SPF: eid=;;;mid=;;;hst=in01.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, benjamin.thery@bull.net, dlezcano@fr.ibm.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 in01.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 Because of rename ordering problems we occassionally give false warnings about invalid sysfs operations, so implement a helper function for this common sysfs idiom. This is a stripped down version of an earlier patch that also added sysfs_delete_link. Cc: Benjamin Thery Cc: Daniel Lezcano Cc: Tejun Heo Signed-off-by: Eric W. Biederman --- fs/sysfs/symlink.c | 16 ++++++++++++++++ include/linux/sysfs.h | 9 +++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c index a3ba217..11c4da5 100644 --- a/fs/sysfs/symlink.c +++ b/fs/sysfs/symlink.c @@ -122,6 +122,22 @@ void sysfs_remove_link(struct kobject * kobj, const char * name) sysfs_hash_and_remove(parent_sd, name); } +/** + * sysfs_rename_link - rename symlink in object's directory. + * @kobj: object we're acting for. + * @targ: object we're pointing to. + * @old: previous name of the symlink. + * @new: new name of the symlink. + * + * A helper function for the common rename symlink idiom. + */ +int sysfs_rename_link(struct kobject *kobj, struct kobject *targ, + const char *old, const char *new) +{ + sysfs_remove_link(kobj, old); + return sysfs_create_link(kobj, targ, new); +} + static int sysfs_get_target_path(struct sysfs_dirent *parent_sd, struct sysfs_dirent *target_sd, char *path) { diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 9d68fed..18c8e70 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -109,6 +109,9 @@ int __must_check sysfs_create_link_nowarn(struct kobject *kobj, const char *name); void sysfs_remove_link(struct kobject *kobj, const char *name); +int sysfs_rename_link(struct kobject *kobj, struct kobject *target, + const char *old_name, const char *new_name); + int __must_check sysfs_create_group(struct kobject *kobj, const struct attribute_group *grp); int sysfs_update_group(struct kobject *kobj, @@ -202,6 +205,12 @@ static inline void sysfs_remove_link(struct kobject *kobj, const char *name) { } +static inline int sysfs_rename_link(struct kobject *k, struct kobject *t, + const char *old_name, const char *new_name) +{ + return 0; +} + static inline int sysfs_create_group(struct kobject *kobj, const struct attribute_group *grp) { -- 1.6.1.2.350.g88cc