From patchwork Tue Oct 11 05:34:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9370133 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 4F7A1607FD for ; Tue, 11 Oct 2016 05:34:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EE5429A6F for ; Tue, 11 Oct 2016 05:34:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 331D029A8B; Tue, 11 Oct 2016 05:34:54 +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 69A0029A70 for ; Tue, 11 Oct 2016 05:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbcJKFef (ORCPT ); Tue, 11 Oct 2016 01:34:35 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55355 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752528AbcJKFec (ORCPT ); Tue, 11 Oct 2016 01:34:32 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 7B8AD20905; Tue, 11 Oct 2016 01:34:31 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Tue, 11 Oct 2016 01:34:31 -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=pFB6EBdS08y+BFMAH+wDszktdM4=; b=ghG8FG cIK8lL//ymvwPg4VsXJ2yPNBztvtGADYHb2mqsarv3XF0huG/e3fUtTKuG2HbExn dYA+hrFpVFjwoiY7y6RS52eTsbY/7LcCCV71t2ssz/607MFMDj+6xkk0BzvGdJUB dpnkZeVhhgMAc1P2PxcRHZMYIg0F8F+glC8us= 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=pFB6EBdS08y+BFM AH+wDszktdM4=; b=dGG+r+aAlUZgwg7EjC6AQYlPGffHA8oVILwUhcfYlrmRiMH cEc4pRunv3IkMBlkr4mAxzaP2FM6OxAATmxsnz+V61jBCnvkM+VHKHNgbhrzdy9e yfYVfUzOsRPipwSu+25D/2AGjHHmegqf12r/VV+Lt6GDKR+cOoz1SfAT/nf0= X-Sasl-enc: iLBnh2nC0z0ZZCx2j3GjTZg0fFy0VINitAP5syuKLUuN 1476164071 Received: from pluto.themaw.net (203-59-161-156.dyn.iinet.net.au [203.59.161.156]) by mail.messagingengine.com (Postfix) with ESMTPA id F23C7F2985; Tue, 11 Oct 2016 01:34:30 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id A3F43A008A; Tue, 11 Oct 2016 13:34:28 +0800 (AWST) Subject: [PATCH 8/8] vfs - remove unused have_submounts() function From: Ian Kent To: Andrew Morton Cc: autofs mailing list , Kernel Mailing List , "Eric W. Biederman" , linux-fsdevel , Omar Sandoval , Al Viro Date: Tue, 11 Oct 2016 13:34:28 +0800 Message-ID: <20161011053428.27645.12310.stgit@pluto.themaw.net> In-Reply-To: <20161011053352.27645.83962.stgit@pluto.themaw.net> References: <20161011053352.27645.83962.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 Now that path_has_submounts() has been added have_submounts() is no longer used 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 872f04e..719d8b4 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1273,39 +1273,6 @@ static void d_walk(struct dentry *parent, void *data, goto again; } -/* - * 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_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); - struct check_mount { struct vfsmount *mnt; unsigned int mounted; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index e351646..44a9a9b 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 path_has_submounts(struct path *); /*