From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 34/74] union-mount: Create IS_MNT_UNION() Date: Tue, 22 Mar 2011 18:59:10 -0700 Message-ID: <1300845590-14184-35-git-send-email-valerie.aurora@gmail.com> References: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> Cc: viro@zeniv.linux.org.uk, Jan Blunck , Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Return-path: Received: from mail-iw0-f174.google.com ([209.85.214.174]:50862 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756665Ab1CWCBt (ORCPT ); Tue, 22 Mar 2011 22:01:49 -0400 In-Reply-To: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Jan Blunck IS_MNT_UNION() tests whether a vfsmount is a union. Note that a directory in a union mounted file system is not necessarily unioned. Use IS_DIR_UNIONED() to test that. Signed-off-by: Valerie Aurora --- fs/union.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/union.h b/fs/union.h index 1692803..c496823 100644 --- a/fs/union.h +++ b/fs/union.h @@ -49,6 +49,7 @@ struct union_stack { struct path u_dirs[0]; }; +#define IS_MNT_UNION(mnt) ((mnt)->mnt_flags & MNT_UNION) #define IS_DIR_UNIONED(dentry) ((dentry)->d_union_stack) extern void d_free_unions(struct dentry *); @@ -64,6 +65,7 @@ static inline struct path *union_find_dir(struct dentry *dentry, #else /* CONFIG_UNION_MOUNT */ +#define IS_MNT_UNION(x) (0) #define IS_DIR_UNIONED(x) (0) #define d_free_unions(x) do { } while (0) -- 1.7.0.4