Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757472AbYHUGo2 (ORCPT ); Thu, 21 Aug 2008 02:44:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754830AbYHUGoA (ORCPT ); Thu, 21 Aug 2008 02:44:00 -0400 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 From: ebiederm@xmission.com (Eric W. Biederman) To: Greg KH 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 References: <20080820021754.GA25182@kroah.com> Date: Wed, 20 Aug 2008 23:36:32 -0700 In-Reply-To: (Eric W. Biederman's message of "Wed, 20 Aug 2008 23:35:48 -0700") Message-ID: User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SA-Exim-Connect-IP: 24.130.11.59 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-DCC: XMission; sa01 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Greg KH X-Spam-Relay-Country: X-Spam-Report: * -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% * [score: 0.0003] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa01 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 XM_SPF_Neutral SPF-Neutral Subject: [PATCH 5/8] sysfs: Remove sysfs_create_link_nowarn X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on mgr1.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2400 Lines: 73 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/