12 files changed, 24 insertions, 36 deletions

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 58717cb1970..56a67ab698c 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -126,15 +126,13 @@ static void decode_address(char *buf, unsigned long address)
                         struct vm_area_struct *vma = vml->vma;
 
                         if (address >= vma->vm_start && address < vma->vm_end) {
+                                char _tmpbuf[256];
                                 char *name = p->comm;
                                 struct file *file = vma->vm_file;
-                                if (file) {
-                                        char _tmpbuf[256];
-                                        name = d_path(file->f_dentry,
-                                                      file->f_vfsmnt,
-                                                      _tmpbuf,
-                                                      sizeof(_tmpbuf));
-                                }
+
+                                if (file)
+                                        name = d_path(&file->f_path, _tmpbuf,
+                                                      sizeof(_tmpbuf));
 
                                 /* FLAT does not have its text aligned to the start of
                                  * the map while FDPIC ELF does ...
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index a0585fb6da9..7aeceedcf7d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -206,16 +206,10 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
 /* copy the pathname of a file to a buffer */
 char *file_path(struct file *file, char *buf, int count)
 {
-        struct dentry *d;
-        struct vfsmount *v;
-
         if (!buf)
                 return NULL;
 
-        d = file->f_path.dentry;
-        v = file->f_path.mnt;
-
-        buf = d_path(d, v, buf, count);
+        buf = d_path(&file->f_path, buf, count);
 
         return IS_ERR(buf) ? NULL : buf;
 }
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 3301167d4f2..017a196d041 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3563,8 +3563,7 @@ static ssize_t show_file(struct device *dev, struct device_attribute *attr,
 
         down_read(&fsg->filesem);
         if (backing_file_is_open(curlun)) {     // Get the complete pathname
-                p = d_path(curlun->filp->f_path.dentry,
-                                curlun->filp->f_path.mnt, buf, PAGE_SIZE - 1);
+                p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
                 if (IS_ERR(p))
                         rc = PTR_ERR(p);
                 else {
@@ -3981,9 +3980,8 @@ static int __init fsg_bind(struct usb_gadget *gadget)
                 if (backing_file_is_open(curlun)) {
                         p = NULL;
                         if (pathbuf) {
-                                p = d_path(curlun->filp->f_path.dentry,
-                                        curlun->filp->f_path.mnt,
-                                        pathbuf, PATH_MAX);
+                                p = d_path(&curlun->filp->f_path,
+                                           pathbuf, PATH_MAX);
                                 if (IS_ERR(p))
                                         p = NULL;
                         }
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index ee32c0eac7c..c6e72aebd16 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -2853,7 +2853,7 @@ static void compat_ioctl_error(struct file *filp, unsigned int fd,
         /* find the name of the device. */
         path = (char *)__get_free_page(GFP_KERNEL);
         if (path) {
-                fn = d_path(filp->f_path.dentry, filp->f_path.mnt, path, PAGE_SIZE);
+                fn = d_path(&filp->f_path, path, PAGE_SIZE);
                 if (IS_ERR(fn))
                         fn = "?";
         }
diff --git a/fs/dcache.c b/fs/dcache.c
index 170efbcb1a9..7b4b080219f 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1845,8 +1845,7 @@ Elong:
 
 /**
  * d_path - return the path of a dentry
- * @dentry: dentry to report
- * @vfsmnt: vfsmnt to which the dentry belongs
+ * @path: path to report
  * @buf: buffer to return value in
  * @buflen: buffer length
  *
@@ -1857,8 +1856,7 @@ Elong:
  *
  * "buflen" should be positive. Caller holds the dcache_lock.
  */
-char *d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
-             char *buf, int buflen)
+char *d_path(struct path *path, char *buf, int buflen)
 {
         char *res;
         struct path root;
@@ -1870,15 +1868,15 @@ char *d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
          * user wants to identify the object in /proc/pid/fd/.  The little hack
          * below allows us to generate a name for these objects on demand:
          */
-        if (dentry->d_op && dentry->d_op->d_dname)
-                return dentry->d_op->d_dname(dentry, buf, buflen);
+        if (path->dentry->d_op && path->dentry->d_op->d_dname)
+                return path->dentry->d_op->d_dname(path->dentry, buf, buflen);
 
         read_lock(&current->fs->lock);
         root = current->fs->root;
         path_get(&current->fs->root);
         read_unlock(&current->fs->lock);
         spin_lock(&dcache_lock);
-        res = __d_path(dentry, vfsmnt, &root, buf, buflen);
+        res = __d_path(path->dentry, path->mnt, &root, buf, buflen);
         spin_unlock(&dcache_lock);
         path_put(&root);
         return res;
diff --git a/fs/dcookies.c b/fs/dcookies.c
index 13c29f1f711..855d4b1d619 100644
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -171,7 +171,7 @@ asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user * buf, size_t len)
                 goto out;
 
         /* FIXME: (deleted) ? */
-        path = d_path(dcs->path.dentry, dcs->path.mnt, kbuf, PAGE_SIZE);
+        path = d_path(&dcs->path, kbuf, PAGE_SIZE);
 
         if (IS_ERR(path)) {
                 err = PTR_ERR(path);
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 4a85b40eef4..8a6f7c924c7 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -345,7 +345,7 @@ static void svc_export_request(struct cache_detail *cd,
         char *pth;
 
         qword_add(bpp, blen, exp->ex_client->name);
-        pth = d_path(exp->ex_path.dentry, exp->ex_path.mnt, *bpp, *blen);
+        pth = d_path(&exp->ex_path, *bpp, *blen);
         if (IS_ERR(pth)) {
                 /* is this correct? */
                 (*bpp)[0] = '\n';
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 47338d92db5..88f8edf1825 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1185,7 +1185,7 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
         if (!tmp)
                 return -ENOMEM;
 
-        pathname = d_path(path->dentry, path->mnt, tmp, PAGE_SIZE);
+        pathname = d_path(path, tmp, PAGE_SIZE);
         len = PTR_ERR(pathname);
         if (IS_ERR(pathname))
                 goto out;
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 8d862907f06..853770274f2 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -346,8 +346,7 @@ int seq_path(struct seq_file *m, struct path *path, char *esc)
 {
         if (m->count < m->size) {
                 char *s = m->buf + m->count;
-                char *p = d_path(path->dentry, path->mnt, s,
-                                 m->size - m->count);
+                char *p = d_path(path, s, m->size - m->count);
                 if (!IS_ERR(p)) {
                         while (s <= p) {
                                 char c = *p++;
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index c2c153f97e8..6bd646096fa 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -10,6 +10,7 @@
 #include <linux/rcupdate.h>
 
 struct nameidata;
+struct path;
 struct vfsmount;
 
 /*
@@ -300,8 +301,8 @@ extern int d_validate(struct dentry *, struct dentry *);
  */
 extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
 
-extern char * d_path(struct dentry *, struct vfsmount *, char *, int);
-  
+extern char *d_path(struct path *, char *, int);
+
 /* Allocation counts.. */
 
 /**
diff --git a/kernel/audit.c b/kernel/audit.c
index 783e6570124..2eeea9a1424 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1325,7 +1325,7 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
                 audit_log_format(ab, "<no memory>");
                 return;
         }
-        p = d_path(path->dentry, path->mnt, pathname, PATH_MAX+11);
+        p = d_path(path, pathname, PATH_MAX+11);
         if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
                 /* FIXME: can we save some information here? */
                 audit_log_format(ab, "<too long>");
diff --git a/mm/memory.c b/mm/memory.c
index 717aa0e3be2..e7a6dcacefc 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2719,7 +2719,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
                 if (buf) {
                         char *p, *s;
 
-                        p = d_path(f->f_dentry, f->f_vfsmnt, buf, PAGE_SIZE);
+                        p = d_path(&f->f_path, buf, PAGE_SIZE);
                         if (IS_ERR(p))
                                 p = "?";
                         s = strrchr(p, '/');