3 files changed, 19 insertions, 19 deletions

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 6cbd9c688cfe..073640675a39 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -461,8 +461,8 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 inode, direntry, direntry);
 
         tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb));
         if (IS_ERR(tlink)) {
@@ -540,8 +540,8 @@ int cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,
         struct cifs_fid fid;
         __u32 oplock;
 
-        cifs_dbg(FYI, "cifs_create parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "cifs_create parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 inode, direntry, direntry);
 
         tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb));
         rc = PTR_ERR(tlink);
@@ -713,8 +713,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 parent_dir_inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 parent_dir_inode, direntry, direntry);
 
         /* check whether path exists */
 
@@ -833,7 +833,7 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags)
 {
         int rc = 0;
 
-        cifs_dbg(FYI, "In cifs d_delete, name = %s\n", direntry->d_name.name);
+        cifs_dbg(FYI, "In cifs d_delete, name = %pd\n", direntry);
 
         return rc;
 }     */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7c018a1c52f7..dc3c7e6aff1f 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1650,8 +1650,8 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,
 
         cifs_sb = CIFS_SB(dentry->d_sb);
 
-        cifs_dbg(FYI, "write %zd bytes to offset %lld of %s\n",
-                 write_size, *offset, dentry->d_name.name);
+        cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",
+                 write_size, *offset, dentry);
 
         tcon = tlink_tcon(open_file->tlink);
         server = tcon->ses->server;
@@ -2273,8 +2273,8 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "Sync file - name: %s datasync: 0x%x\n",
-                 file->f_path.dentry->d_name.name, datasync);
+        cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
+                 file, datasync);
 
         if (!CIFS_CACHE_READ(CIFS_I(inode))) {
                 rc = cifs_zap_mapping(inode);
@@ -2315,8 +2315,8 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "Sync file - name: %s datasync: 0x%x\n",
-                 file->f_path.dentry->d_name.name, datasync);
+        cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
+                 file, datasync);
 
         tcon = tlink_tcon(smbfile->tlink);
         if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 7899a40465b3..8fd4ee8e07ff 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1419,8 +1419,8 @@ cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
         d_instantiate(dentry, newinode);
 
 #ifdef CONFIG_CIFS_DEBUG2
-        cifs_dbg(FYI, "instantiated dentry %p %s to inode %p\n",
-                 dentry, dentry->d_name.name, newinode);
+        cifs_dbg(FYI, "instantiated dentry %p %pd to inode %p\n",
+                 dentry, dentry, newinode);
 
         if (newinode->i_nlink != 2)
                 cifs_dbg(FYI, "unexpected number of links %d\n",
@@ -2111,8 +2111,8 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
         struct cifs_unix_set_info_args *args = NULL;
         struct cifsFileInfo *open_file;
 
-        cifs_dbg(FYI, "setattr_unix on file %s attrs->ia_valid=0x%x\n",
-                 direntry->d_name.name, attrs->ia_valid);
+        cifs_dbg(FYI, "setattr_unix on file %pd attrs->ia_valid=0x%x\n",
+                 direntry, attrs->ia_valid);
 
         xid = get_xid();
 
@@ -2254,8 +2254,8 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "setattr on file %s attrs->iavalid 0x%x\n",
-                 direntry->d_name.name, attrs->ia_valid);
+        cifs_dbg(FYI, "setattr on file %pd attrs->iavalid 0x%x\n",
+                 direntry, attrs->ia_valid);
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                 attrs->ia_valid |= ATTR_FORCE;