diff --git a/[refs] b/[refs]
index 5b0b3aa48636..ffbf8ab74e6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e7f449b225ee6c87454ac069f0a041035c5140
+refs/heads/master: 20d4fdc1a788e4ca0aaf2422772ba668e7e10839
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 3ee588d5f585..c4c9072d810c 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -1847,7 +1847,7 @@ char *__d_path(const struct path *path, struct path *root,
  *
  * "buflen" should be positive. Caller holds the dcache_lock.
  */
-char *d_path(struct path *path, char *buf, int buflen)
+char *d_path(const struct path *path, char *buf, int buflen)
 {
 	char *res;
 	struct path root;
diff --git a/trunk/include/linux/dcache.h b/trunk/include/linux/dcache.h
index 2a6639407c80..d982eb89c77d 100644
--- a/trunk/include/linux/dcache.h
+++ b/trunk/include/linux/dcache.h
@@ -300,7 +300,7 @@ extern int d_validate(struct dentry *, struct dentry *);
 extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
 
 extern char *__d_path(const struct path *path, struct path *root, char *, int);
-extern char *d_path(struct path *, char *, int);
+extern char *d_path(const struct path *, char *, int);
 extern char *dentry_path(struct dentry *, char *, int);
 
 /* Allocation counts.. */