From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 11/34] union-mount: Add union_find_dir() Date: Thu, 16 Sep 2010 15:12:02 -0700 Message-ID: <1284675145-4391-12-git-send-email-vaurora@redhat.com> References: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Cc: Miklos Szeredi , Christoph Hellwig , Andreas Gruenbacher , Nick Piggin , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora To: Alexander Viro Return-path: In-Reply-To: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org 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.6.3.3