From patchwork Wed Sep 14 06:14:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9330431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 341D0607FD for ; Wed, 14 Sep 2016 06:15:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2352729941 for ; Wed, 14 Sep 2016 06:15:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 173FB29947; Wed, 14 Sep 2016 06:15:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 546AD29941 for ; Wed, 14 Sep 2016 06:15:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759478AbcINGPC (ORCPT ); Wed, 14 Sep 2016 02:15:02 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45314 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbcINGO7 (ORCPT ); Wed, 14 Sep 2016 02:14:59 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id EDFA52029C; Wed, 14 Sep 2016 02:14:52 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Wed, 14 Sep 2016 02:14:53 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=themaw.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=1EwFhspeI8c0Y2Xz2rqoW4eAkQs=; b=vkLj4B sgPK/Vp/ba5GRWjwvIyIdTgISKV05gcFJ+lKEQtjXnP7JedFa3T8ynwcezdMbFaw ygwRyYCeQH/rBlyVoZn9CIpUCFksjVdeoIJXxG52oSSsV5iHcl2BxtCP+W3Co/AS WTvr9V9RcTEwBsu0hDtfZIWALjPuLmGkvb1Lc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=1EwFhspeI8c0Y2X z2rqoW4eAkQs=; b=Fwu6OhhM70ulT0/sfmtu0rzoyiGLHin/6DM4jlb8FjKsdq0 sGS82DLus0CvEsN16czmVngU1Bm8m9uObaUHCY1qIw3aDQAoh9JZKKstOhhg708k DLv1E414GqJtc0KVsxI3M8xOHjvUUf7r8RNfJQsDcFee4ZxoJB6L+a3xKgB4= X-Sasl-enc: wadUodcBhPKBlVzWLxAbQJZz6wW4F0fZBeUX/KpUFGKF 1473833692 Received: from pluto.themaw.net (106-68-162-102.dyn.iinet.net.au [106.68.162.102]) by mail.messagingengine.com (Postfix) with ESMTPA id 6869FCCE90; Wed, 14 Sep 2016 02:14:52 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id 5A9AAA0061; Wed, 14 Sep 2016 14:14:50 +0800 (AWST) Subject: [PATCH 4/4] fs - remove unused have_submounts() function From: Ian Kent To: Andrew Morton Cc: autofs mailing list , Kernel Mailing List , Al Viro , linux-fsdevel , Omar Sandoval , "Eric W. Biederman" Date: Wed, 14 Sep 2016 14:14:50 +0800 Message-ID: <20160914061450.24714.99912.stgit@pluto.themaw.net> In-Reply-To: <20160914061434.24714.490.stgit@pluto.themaw.net> References: <20160914061434.24714.490.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Having added the have_local_submounts() function there are no remaining users of have_submounts() so remove it. Signed-off-by: Ian Kent Cc: Al Viro Cc: Eric W. Biederman Cc: Omar Sandoval --- fs/dcache.c | 33 --------------------------------- include/linux/dcache.h | 1 - 2 files changed, 34 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/dcache.c b/fs/dcache.c index 218166b..ad36f23 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1279,39 +1279,6 @@ rename_retry: * list is non-empty and continue searching. */ -static enum d_walk_ret check_mount(void *data, struct dentry *dentry) -{ - int *ret = data; - if (d_mountpoint(dentry)) { - *ret = 1; - return D_WALK_QUIT; - } - return D_WALK_CONTINUE; -} - -/** - * have_submounts - check for mounts over a dentry - * @parent: dentry to check. - * - * Return true if the parent or its subdirectories contain - * a mount point - */ -int have_submounts(struct dentry *parent) -{ - int ret = 0; - - d_walk(parent, &ret, check_mount, NULL); - - return ret; -} -EXPORT_SYMBOL(have_submounts); - -/* - * Search for at least 1 mount point in the dentry's subdirs. - * We descend to the next level whenever the d_subdirs - * list is non-empty and continue searching. - */ - static enum d_walk_ret check_local_mount(void *data, struct dentry *dentry) { int *ret = data; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 796b358..7220683 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -254,7 +254,6 @@ extern struct dentry *d_find_alias(struct inode *); extern void d_prune_aliases(struct inode *); /* test whether we have any submounts in a subdir tree */ -extern int have_submounts(struct dentry *); extern int have_local_submounts(struct dentry *); /*