Merge tag 'trace-seq-buf-3.19-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / ceph / debugfs.c

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index 5d5a4c8..1b23551 100644 (file)
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -83,10 +83,9 @@ static int mdsc_show(struct seq_file *s, void *p)
                        if (IS_ERR(path))
                                path = NULL;
                        spin_lock(&req->r_dentry->d_lock);
-                       seq_printf(s, " #%llx/%.*s (%s)",
+                       seq_printf(s, " #%llx/%pd (%s)",
                                   ceph_ino(req->r_dentry->d_parent->d_inode),
-                                  req->r_dentry->d_name.len,
-                                  req->r_dentry->d_name.name,
+                                  req->r_dentry,
                                   path ? path : "");
                        spin_unlock(&req->r_dentry->d_lock);
                        kfree(path);
@@ -103,11 +102,10 @@ static int mdsc_show(struct seq_file *s, void *p)
                        if (IS_ERR(path))
                                path = NULL;
                        spin_lock(&req->r_old_dentry->d_lock);
-                       seq_printf(s, " #%llx/%.*s (%s)",
+                       seq_printf(s, " #%llx/%pd (%s)",
                                   req->r_old_dentry_dir ?
                                   ceph_ino(req->r_old_dentry_dir) : 0,
-                                  req->r_old_dentry->d_name.len,
-                                  req->r_old_dentry->d_name.name,
+                                  req->r_old_dentry,
                                   path ? path : "");
                        spin_unlock(&req->r_old_dentry->d_lock);
                        kfree(path);
@@ -150,8 +148,8 @@ static int dentry_lru_show(struct seq_file *s, void *ptr)
        spin_lock(&mdsc->dentry_lru_lock);
        list_for_each_entry(di, &mdsc->dentry_lru, lru) {
                struct dentry *dentry = di->dentry;
-               seq_printf(s, "%p %p\t%.*s\n",
-                          di, dentry, dentry->d_name.len, dentry->d_name.name);
+               seq_printf(s, "%p %p\t%pd\n",
+                          di, dentry, dentry);
        }
        spin_unlock(&mdsc->dentry_lru_lock);