From patchwork Tue Oct 11 05:34:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9370145 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 B80B660772 for ; Tue, 11 Oct 2016 05:35:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A475129516 for ; Tue, 11 Oct 2016 05:35:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94966296BA; Tue, 11 Oct 2016 05:35:42 +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=unavailable 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 1919329516 for ; Tue, 11 Oct 2016 05:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752147AbcJKFeJ (ORCPT ); Tue, 11 Oct 2016 01:34:09 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46721 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691AbcJKFeG (ORCPT ); Tue, 11 Oct 2016 01:34:06 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D5272208D1; Tue, 11 Oct 2016 01:34:05 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Tue, 11 Oct 2016 01:34:05 -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=yQaQmb2ZvqS2cPb3Ps8+otMivlk=; b=AmekM7 J9F0ksbv1wNzipijRUz1TzPa7gv8xFcxRicWvYy6CdXUehv1QbBz5gPQ80nuajHw rVv+OFIYrARKBQ7tD+zeIpCpDLVFJTxqjQ94ff1GIM4m5FzOWQogQmd8saabFLN8 mPub9SZJv9RiNHduNuugmagx3fJ4cesEqUWXM= 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=yQaQmb2ZvqS2cPb 3Ps8+otMivlk=; b=HeCpOcUZosnvlcL7dCyJdA6HK9edziJfuz3atl82SqkDW41 4I1us7TCwu+sjVX1WwU2A1AcIG1XQjpuRyhI3uCK5h4wu/7+wSplYXP+vMO1y1dl VwxY5Tapxh2xuGyuI8wFcS+hUF8J8XVido6d6DQkVRPxSmZwl0qeL4GPONYQ= X-Sasl-enc: oWJn6fV3PfVQL6/BB6xpqHDtMamCKi0JfUO4adabPjVx 1476164045 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 4F1D1CC082; Tue, 11 Oct 2016 01:34:05 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id 3045EA008A; Tue, 11 Oct 2016 13:34:03 +0800 (AWST) Subject: [PATCH 3/8] vfs - add path_has_submounts() 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:03 +0800 Message-ID: <20161011053403.27645.55242.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 From: Ian Kent d_mountpoint() can only be used reliably to establish if a dentry is not mounted in any namespace. It isn't aware of the possibility there may be multiple mounts using the given dentry, possibly in a different namespace. Add function, path_has_submounts(), that checks is a struct path contains mounts (or is a mountpoint itself) to handle this case. Signed-off-by: Ian Kent Cc: Al Viro Cc: Eric W. Biederman Cc: Omar Sandoval --- fs/dcache.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/dcache.h | 1 + 2 files changed, 36 insertions(+) -- 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 5c7cc95..872f04e 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1306,6 +1306,41 @@ int have_submounts(struct dentry *parent) } EXPORT_SYMBOL(have_submounts); +struct check_mount { + struct vfsmount *mnt; + unsigned int mounted; +}; + +static enum d_walk_ret path_check_mount(void *data, struct dentry *dentry) +{ + struct check_mount *info = data; + struct path path = { .mnt = info->mnt, .dentry = dentry }; + + if (path_is_mountpoint(&path)) { + info->mounted = 1; + return D_WALK_QUIT; + } + return D_WALK_CONTINUE; +} + +/** + * path_has_submounts - check for mounts over a dentry in the + * current namespace. + * @parent: path to check. + * + * Return true if the parent or its subdirectories contain + * a mount point in the current namespace. + */ +int path_has_submounts(struct path *parent) +{ + struct check_mount data = { .mnt = parent->mnt, .mounted = 0 }; + + d_walk(parent->dentry, &data, path_check_mount, NULL); + + return data.mounted; +} +EXPORT_SYMBOL(path_has_submounts); + /* * Called by mount code to set a mountpoint and check if the mountpoint is * reachable (e.g. NFS can unhash a directory dentry and then the complete diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 798bc04..e351646 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -255,6 +255,7 @@ 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 *); /* * This adds the entry to the hash queues.