From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm@xmission.com (Eric W. Biederman) Subject: [PATCH 5/8] sysfs: Remove sysfs_create_link_nowarn Date: Wed, 20 Aug 2008 23:36:32 -0700 Message-ID: References: <20080820021754.GA25182@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Greg Kroah-Hartman , Andrew Morton , Tejun Heo , Daniel Lezcano , linux-kernel@vger.kernel.org, Al Viro , Linux Containers , Benjamin Thery , netdev@vger.kernel.org To: Greg KH Return-path: Received: from out02.mta.xmission.com ([166.70.13.232]:50418 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754156AbYHUGn7 (ORCPT ); Thu, 21 Aug 2008 02:43:59 -0400 In-Reply-To: (Eric W. Biederman's message of "Wed, 20 Aug 2008 23:35:48 -0700") Sender: netdev-owner@vger.kernel.org List-ID: All of the uses have been replaced by sysfs_rename_link which is a clearer primitive to is also needed for the tagged directory support. Signed-off-by: Eric W. Biederman --- fs/sysfs/symlink.c | 15 --------------- include/linux/sysfs.h | 10 ---------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c index 2a64645..3c7a338 100644 --- a/fs/sysfs/symlink.c +++ b/fs/sysfs/symlink.c @@ -90,21 +90,6 @@ int sysfs_create_link(struct kobject *kobj, struct kobject *target, } /** - * sysfs_create_link_nowarn - create symlink between two objects. - * @kobj: object whose directory we're creating the link in. - * @target: object we're pointing to. - * @name: name of the symlink. - * - * This function does the same as sysf_create_link(), but it - * doesn't warn if the link already exists. - */ -int sysfs_create_link_nowarn(struct kobject *kobj, struct kobject *target, - const char *name) -{ - return sysfs_do_create_link(kobj, target, name, 0); -} - -/** * sysfs_delete_link - remove symlink in object's directory. * @kobj: object we're acting for. * @targ: object we're pointing to. diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 1204d45..4e1bfdb 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -112,9 +112,6 @@ void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr); int __must_check sysfs_create_link(struct kobject *kobj, struct kobject *target, const char *name); -int __must_check sysfs_create_link_nowarn(struct kobject *kobj, - struct kobject *target, - const char *name); void sysfs_remove_link(struct kobject *kobj, const char *name); int sysfs_rename_link(struct kobject *kobj, struct kobject *target, @@ -211,13 +208,6 @@ static inline int sysfs_create_link(struct kobject *kobj, return 0; } -static inline int sysfs_create_link_nowarn(struct kobject *kobj, - struct kobject *target, - const char *name) -{ - return 0; -} - static inline void sysfs_remove_link(struct kobject *kobj, const char *name) { } -- 1.5.3.rc6.17.g1911