diff --git a/[refs] b/[refs] index fb5ce3d99751..37d586c366b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc2a5271155a108c9c6a8d70ec4e4f860f32cd07 +refs/heads/master: a713ca2ab9d14dc5c86634bc445ce1f66552c169 diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 8f15e8d71bba..93d9f4e1a8ed 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -1919,7 +1919,7 @@ EXPORT_SYMBOL(d_lookup); * * __d_lookup callers must be commented. */ -struct dentry *__d_lookup(struct dentry *parent, struct qstr *name) +struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name) { unsigned int len = name->len; unsigned int hash = name->hash; diff --git a/trunk/include/linux/dcache.h b/trunk/include/linux/dcache.h index 63e96844a8e8..969086c03301 100644 --- a/trunk/include/linux/dcache.h +++ b/trunk/include/linux/dcache.h @@ -295,7 +295,7 @@ 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_hash_and_lookup(struct dentry *, struct qstr *); -extern struct dentry *__d_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, const struct qstr *name, unsigned *seq, struct inode *inode);