assorted conversions to %p[dD]

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / dcache.c

diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index 92edcfc23c1c0f7cabf5066d6dd503ff1b54bd4b..4fda7a5f3088a7144240193508369ba259875a72 100644 (file)
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -251,8 +251,8 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry,
 
        if (dl) {
                mlog_bug_on_msg(dl->dl_parent_blkno != parent_blkno,
-                               " \"%.*s\": old parent: %llu, new: %llu\n",
-                               dentry->d_name.len, dentry->d_name.name,
+                               " \"%pd\": old parent: %llu, new: %llu\n",
+                               dentry,
                                (unsigned long long)parent_blkno,
                                (unsigned long long)dl->dl_parent_blkno);
                return 0;
@@ -277,8 +277,8 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry,
                                (unsigned long long)OCFS2_I(inode)->ip_blkno);
 
                mlog_bug_on_msg(dl->dl_parent_blkno != parent_blkno,
-                               " \"%.*s\": old parent: %llu, new: %llu\n",
-                               dentry->d_name.len, dentry->d_name.name,
+                               " \"%pd\": old parent: %llu, new: %llu\n",
+                               dentry,
                                (unsigned long long)parent_blkno,
                                (unsigned long long)dl->dl_parent_blkno);
 
@@ -406,17 +406,15 @@ static void ocfs2_dentry_iput(struct dentry *dentry, struct inode *inode)
                        if (inode)
                                ino = (unsigned long long)OCFS2_I(inode)->ip_blkno;
                        mlog(ML_ERROR, "Dentry is missing cluster lock. "
-                            "inode: %llu, d_flags: 0x%x, d_name: %.*s\n",
-                            ino, dentry->d_flags, dentry->d_name.len,
-                            dentry->d_name.name);
+                            "inode: %llu, d_flags: 0x%x, d_name: %pd\n",
+                            ino, dentry->d_flags, dentry);
                }
 
                goto out;
        }
 
-       mlog_bug_on_msg(dl->dl_count == 0, "dentry: %.*s, count: %u\n",
-                       dentry->d_name.len, dentry->d_name.name,
-                       dl->dl_count);
+       mlog_bug_on_msg(dl->dl_count == 0, "dentry: %pd, count: %u\n",
+                       dentry, dl->dl_count);
 
        ocfs2_dentry_lock_put(OCFS2_SB(dentry->d_sb), dl);