8 files changed, 9 insertions, 17 deletions

diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c
index a6ee3d750c30..6b88a35fb048 100644
--- a/drivers/block/drbd/drbd_debugfs.c
+++ b/drivers/block/drbd/drbd_debugfs.c
@@ -419,14 +419,6 @@ static int in_flight_summary_show(struct seq_file *m, void *pos)
         return 0;
 }
 
-/* simple_positive(file->f_path.dentry) respectively debugfs_positive(),
- * but neither is "reachable" from here.
- * So we have our own inline version of it above.  :-( */
-static inline int debugfs_positive(struct dentry *dentry)
-{
-        return d_really_is_positive(dentry) && !d_unhashed(dentry);
-}
-
 /* make sure at *open* time that the respective object won't go away. */
 static int drbd_single_open(struct file *file, int (*show)(struct seq_file *, void *),
                                 void *data, struct kref *kref,
@@ -444,7 +436,7 @@ static int drbd_single_open(struct file *file, int (*show)(struct seq_file *, vo
         /* serialize with d_delete() */
         mutex_lock(&d_inode(parent)->i_mutex);
         /* Make sure the object is still alive */
-        if (debugfs_positive(file->f_path.dentry)
+        if (simple_positive(file->f_path.dentry)
         && kref_get_unless_zero(kref))
                 ret = 0;
         mutex_unlock(&d_inode(parent)->i_mutex);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 40580dc7f41c..f7a4c9d7f721 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -588,7 +588,7 @@ static ssize_t loop_attr_backing_file_show(struct loop_device *lo, char *buf)
 
         spin_lock_irq(&lo->lo_lock);
         if (lo->lo_backing_file)
-                p = d_path(&lo->lo_backing_file->f_path, buf, PAGE_SIZE - 1);
+                p = file_path(lo->lo_backing_file, buf, PAGE_SIZE - 1);
         spin_unlock_irq(&lo->lo_lock);
 
         if (IS_ERR_OR_NULL(p))
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 1ca8e32a9592..25422a3a7238 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -277,7 +277,7 @@ static int remove_file(struct dentry *parent, char *name)
         }
 
         spin_lock(&tmp->d_lock);
-        if (!d_unhashed(tmp) && d_really_is_positive(tmp)) {
+        if (simple_positive(tmp)) {
                 dget_dlock(tmp);
                 __d_drop(tmp);
                 spin_unlock(&tmp->d_lock);
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index bdd5d3857203..13ef22bd9459 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -455,7 +455,7 @@ static int remove_file(struct dentry *parent, char *name)
         }
 
         spin_lock(&tmp->d_lock);
-        if (!d_unhashed(tmp) && d_really_is_positive(tmp)) {
+        if (simple_positive(tmp)) {
                 __d_drop(tmp);
                 spin_unlock(&tmp->d_lock);
                 simple_unlink(d_inode(parent), tmp);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 135a0907e9de..ed2346ddf4c9 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -839,7 +839,7 @@ static void bitmap_file_kick(struct bitmap *bitmap)
                 if (bitmap->storage.file) {
                         path = kmalloc(PAGE_SIZE, GFP_KERNEL);
                         if (path)
-                                ptr = d_path(&bitmap->storage.file->f_path,
+                                ptr = file_path(bitmap->storage.file,
                                              path, PAGE_SIZE);
 
                         printk(KERN_ALERT
@@ -1927,7 +1927,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
                    chunk_kb ? "KB" : "B");
         if (bitmap->storage.file) {
                 seq_printf(seq, ", file: ");
-                seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
+                seq_file_path(seq, bitmap->storage.file, " \t\n");
         }
 
         seq_printf(seq, "\n");
diff --git a/drivers/md/md.c b/drivers/md/md.c
index df92d30ca054..d429c30cd514 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5766,7 +5766,7 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg)
         /* bitmap disabled, zero the first byte and copy out */
         if (!mddev->bitmap_info.file)
                 file->pathname[0] = '\0';
-        else if ((ptr = d_path(&mddev->bitmap_info.file->f_path,
+        else if ((ptr = file_path(mddev->bitmap_info.file,
                                file->pathname, sizeof(file->pathname))),
                  IS_ERR(ptr))
                 err = PTR_ERR(ptr);
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 3cc109f3c9c8..d2259c663996 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -2936,7 +2936,7 @@ int fsg_common_create_lun(struct fsg_common *common, struct fsg_lun_config *cfg,
         if (fsg_lun_is_open(lun)) {
                 p = "(error)";
                 if (pathbuf) {
-                        p = d_path(&lun->filp->f_path, pathbuf, PATH_MAX);
+                        p = file_path(lun->filp, pathbuf, PATH_MAX);
                         if (IS_ERR(p))
                                 p = "(error)";
                 }
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index 648f9e489b39..d62683017cf3 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -341,7 +341,7 @@ ssize_t fsg_show_file(struct fsg_lun *curlun, struct rw_semaphore *filesem,
 
         down_read(filesem);
         if (fsg_lun_is_open(curlun)) {  /* Get the complete pathname */
-                p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
+                p = file_path(curlun->filp, buf, PAGE_SIZE - 1);
                 if (IS_ERR(p))
                         rc = PTR_ERR(p);
                 else {