From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 29/74] union-mount: Add union_find_dir() Date: Tue, 22 Mar 2011 18:59:05 -0700 Message-ID: <1300845590-14184-30-git-send-email-valerie.aurora@gmail.com> References: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> Cc: viro@zeniv.linux.org.uk, Valerie Aurora , 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]:36176 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756205Ab1CWCBj (ORCPT ); Tue, 22 Mar 2011 22:01:39 -0400 In-Reply-To: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Valerie Aurora union_find_dir() returns the path of the directory at the specified layer in a unioned directory. Signed-off-by: Valerie Aurora --- fs/union.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/fs/union.h b/fs/union.h index 38b26fd..e242451 100644 --- a/fs/union.h +++ b/fs/union.h @@ -49,6 +49,16 @@ struct union_stack { struct path u_dirs[0]; }; +static inline struct path *union_find_dir(struct dentry *dentry, + unsigned int layer) { + BUG_ON(layer >= dentry->d_sb->s_union_count); + return &(dentry->d_union_stack->u_dirs[layer]); +} + +#else /* CONFIG_UNION_MOUNT */ + +#define union_find_dir(x, y) ({ BUG(); (NULL); }) + #endif /* CONFIG_UNION_MOUNT */ #endif /* __KERNEL__ */ #endif /* __LINUX_UNION_H */ -- 1.7.0.4