nf/dccp: merge errorpaths

[safe/jmp/linux-2.6] / include / linux / dcache.h

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 74c64ae..a37359d 100644 (file)
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -287,6 +287,7 @@ static inline struct dentry *d_add_unique(struct dentry *entry, struct inode *in
 
 /* used for rename() and baskets */
 extern void d_move(struct dentry *, struct dentry *);
+extern struct dentry *d_ancestor(struct dentry *, struct dentry *);
 
 /* appendix may either be NULL or be used for transname suffixes */
 extern struct dentry * d_lookup(struct dentry *, struct qstr *);