diff --git a/[refs] b/[refs] index 37d586c366b2..1cc26b2f03e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a713ca2ab9d14dc5c86634bc445ce1f66552c169 +refs/heads/master: da2d8455ed7eb22d7642ecee43dc463ac42a1256 diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 93d9f4e1a8ed..0e4b5fa6c9f9 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -1889,7 +1889,7 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent, * dentry is returned. The caller must use dput to free the entry when it has * finished using it. %NULL is returned if the dentry does not exist. */ -struct dentry *d_lookup(struct dentry *parent, struct qstr *name) +struct dentry *d_lookup(const struct dentry *parent, const struct qstr *name) { struct dentry *dentry; unsigned seq; diff --git a/trunk/include/linux/dcache.h b/trunk/include/linux/dcache.h index 969086c03301..03d169288423 100644 --- a/trunk/include/linux/dcache.h +++ b/trunk/include/linux/dcache.h @@ -293,7 +293,7 @@ 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 *); +extern struct dentry *d_lookup(const struct dentry *, const struct qstr *); extern struct dentry *d_hash_and_lookup(struct dentry *, struct qstr *); extern struct dentry *__d_lookup(const struct dentry *, const struct qstr *); extern struct dentry *__d_lookup_rcu(const struct dentry *parent,