Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / fs / affs / namei.c

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index 035bd31..bbc3853 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -190,8 +190,7 @@ affs_find_entry(struct inode *dir, struct dentry *dentry)
        toupper_t toupper = affs_get_toupper(sb);
        u32 key;
 
-       pr_debug("%s(\"%.*s\")\n",
-                __func__, (int)dentry->d_name.len, dentry->d_name.name);
+       pr_debug("%s(\"%pd\")\n", __func__, dentry);
 
        bh = affs_bread(sb, dir->i_ino);
        if (!bh)
@@ -219,8 +218,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
        struct buffer_head *bh;
        struct inode *inode = NULL;
 
-       pr_debug("%s(\"%.*s\")\n",
-                __func__, (int)dentry->d_name.len, dentry->d_name.name);
+       pr_debug("%s(\"%pd\")\n", __func__, dentry);
 
        affs_lock_dir(dir);
        bh = affs_find_entry(dir, dentry);
@@ -250,9 +248,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 int
 affs_unlink(struct inode *dir, struct dentry *dentry)
 {
-       pr_debug("%s(dir=%d, %lu \"%.*s\")\n",
+       pr_debug("%s(dir=%d, %lu \"%pd\")\n",
                 __func__, (u32)dir->i_ino, dentry->d_inode->i_ino,
-               (int)dentry->d_name.len, dentry->d_name.name);
+               dentry);
 
        return affs_remove_header(dentry);
 }
@@ -264,9 +262,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)
        struct inode    *inode;
        int              error;
 
-       pr_debug("%s(%lu,\"%.*s\",0%ho)\n",
-                __func__, dir->i_ino, (int)dentry->d_name.len,
-                dentry->d_name.name,mode);
+       pr_debug("%s(%lu,\"%pd\",0%ho)\n",
+                __func__, dir->i_ino, dentry, mode);
 
        inode = affs_new_inode(dir);
        if (!inode)
@@ -294,9 +291,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        struct inode            *inode;
        int                      error;
 
-       pr_debug("%s(%lu,\"%.*s\",0%ho)\n",
-                __func__, dir->i_ino, (int)dentry->d_name.len,
-                dentry->d_name.name, mode);
+       pr_debug("%s(%lu,\"%pd\",0%ho)\n",
+                __func__, dir->i_ino, dentry, mode);
 
        inode = affs_new_inode(dir);
        if (!inode)
@@ -321,9 +317,9 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 int
 affs_rmdir(struct inode *dir, struct dentry *dentry)
 {
-       pr_debug("%s(dir=%u, %lu \"%.*s\")\n",
+       pr_debug("%s(dir=%u, %lu \"%pd\")\n",
                __func__, (u32)dir->i_ino, dentry->d_inode->i_ino,
-                (int)dentry->d_name.len, dentry->d_name.name);
+                dentry);
 
        return affs_remove_header(dentry);
 }
@@ -338,9 +334,8 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
        int                      i, maxlen, error;
        char                     c, lc;
 
-       pr_debug("%s(%lu,\"%.*s\" -> \"%s\")\n",
-                __func__, dir->i_ino, (int)dentry->d_name.len,
-                dentry->d_name.name, symname);
+       pr_debug("%s(%lu,\"%pd\" -> \"%s\")\n",
+                __func__, dir->i_ino, dentry, symname);
 
        maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1;
        inode  = affs_new_inode(dir);
@@ -409,9 +404,9 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode = old_dentry->d_inode;
 
-       pr_debug("%s(%u, %u, \"%.*s\")\n",
+       pr_debug("%s(%u, %u, \"%pd\")\n",
                 __func__, (u32)inode->i_ino, (u32)dir->i_ino,
-                (int)dentry->d_name.len,dentry->d_name.name);
+                dentry);
 
        return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
 }
@@ -424,10 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
        struct buffer_head *bh = NULL;
        int retval;
 
-       pr_debug("%s(old=%u,\"%*s\" to new=%u,\"%*s\")\n",
-                __func__, (u32)old_dir->i_ino, (int)old_dentry->d_name.len,
-                old_dentry->d_name.name, (u32)new_dir->i_ino,
-               (int)new_dentry->d_name.len, new_dentry->d_name.name);
+       pr_debug("%s(old=%u,\"%pd\" to new=%u,\"%pd\")\n",
+                __func__, (u32)old_dir->i_ino, old_dentry,
+                (u32)new_dir->i_ino, new_dentry);
 
        retval = affs_check_name(new_dentry->d_name.name,
                                 new_dentry->d_name.len,