Commit a455589f authored by Al Viro's avatar Al Viro

assorted conversions to %p[dD]

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 41d28bca
...@@ -331,8 +331,7 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp, ...@@ -331,8 +331,7 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
if (mm->exe_file) { if (mm->exe_file) {
app_cookie = fast_get_dcookie(&mm->exe_file->f_path); app_cookie = fast_get_dcookie(&mm->exe_file->f_path);
pr_debug("got dcookie for %s\n", pr_debug("got dcookie for %pD\n", mm->exe_file);
mm->exe_file->f_dentry->d_name.name);
} }
for (vma = mm->mmap; vma; vma = vma->vm_next) { for (vma = mm->mmap; vma; vma = vma->vm_next) {
...@@ -342,15 +341,14 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp, ...@@ -342,15 +341,14 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
if (!vma->vm_file) if (!vma->vm_file)
goto fail_no_image_cookie; goto fail_no_image_cookie;
pr_debug("Found spu ELF at %X(object-id:%lx) for file %s\n", pr_debug("Found spu ELF at %X(object-id:%lx) for file %pD\n",
my_offset, spu_ref, my_offset, spu_ref, vma->vm_file);
vma->vm_file->f_dentry->d_name.name);
*offsetp = my_offset; *offsetp = my_offset;
break; break;
} }
*spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path); *spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path);
pr_debug("got dcookie for %s\n", vma->vm_file->f_dentry->d_name.name); pr_debug("got dcookie for %pD\n", vma->vm_file);
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
......
...@@ -83,10 +83,9 @@ static ssize_t dbfs_read(struct file *file, char __user *buf, ...@@ -83,10 +83,9 @@ static ssize_t dbfs_read(struct file *file, char __user *buf,
static long dbfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) static long dbfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
struct hypfs_dbfs_file *df; struct hypfs_dbfs_file *df = file_inode(file)->i_private;
long rc; long rc;
df = file->f_path.dentry->d_inode->i_private;
mutex_lock(&df->lock); mutex_lock(&df->lock);
if (df->unlocked_ioctl) if (df->unlocked_ioctl)
rc = df->unlocked_ioctl(file, cmd, arg); rc = df->unlocked_ioctl(file, cmd, arg);
......
...@@ -342,8 +342,8 @@ static int load_aout_binary(struct linux_binprm *bprm) ...@@ -342,8 +342,8 @@ static int load_aout_binary(struct linux_binprm *bprm)
time_after(jiffies, error_time + 5*HZ)) { time_after(jiffies, error_time + 5*HZ)) {
printk(KERN_WARNING printk(KERN_WARNING
"fd_offset is not page aligned. Please convert " "fd_offset is not page aligned. Please convert "
"program: %s\n", "program: %pD\n",
bprm->file->f_path.dentry->d_name.name); bprm->file);
error_time = jiffies; error_time = jiffies;
} }
#endif #endif
...@@ -429,8 +429,8 @@ static int load_aout_library(struct file *file) ...@@ -429,8 +429,8 @@ static int load_aout_library(struct file *file)
if (time_after(jiffies, error_time + 5*HZ)) { if (time_after(jiffies, error_time + 5*HZ)) {
printk(KERN_WARNING printk(KERN_WARNING
"N_TXTOFF is not page aligned. Please convert " "N_TXTOFF is not page aligned. Please convert "
"library: %s\n", "library: %pD\n",
file->f_path.dentry->d_name.name); file);
error_time = jiffies; error_time = jiffies;
} }
#endif #endif
......
...@@ -226,7 +226,7 @@ struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev, ...@@ -226,7 +226,7 @@ struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,
obj->dev_addr = DMA_ERROR_CODE; obj->dev_addr = DMA_ERROR_CODE;
mapping = obj->obj.filp->f_path.dentry->d_inode->i_mapping; mapping = file_inode(obj->obj.filp)->i_mapping;
mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE); mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE);
DRM_DEBUG_DRIVER("alloc obj %p size %zu\n", obj, size); DRM_DEBUG_DRIVER("alloc obj %p size %zu\n", obj, size);
......
...@@ -157,8 +157,8 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer, ...@@ -157,8 +157,8 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer,
return -EFAULT; return -EFAULT;
} }
string[count] = 0; string[count] = 0;
dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n", dprintk(4, KERN_INFO "%s: write_proc: name=%pD count=%zu zr=%p\n",
ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr); ZR_DEVNAME(zr), file, count, zr);
ldelim = " \t\n"; ldelim = " \t\n";
tdelim = "="; tdelim = "=";
line = strpbrk(sp, ldelim); line = strpbrk(sp, ldelim);
......
...@@ -395,7 +395,7 @@ static void genwqe_vma_open(struct vm_area_struct *vma) ...@@ -395,7 +395,7 @@ static void genwqe_vma_open(struct vm_area_struct *vma)
static void genwqe_vma_close(struct vm_area_struct *vma) static void genwqe_vma_close(struct vm_area_struct *vma)
{ {
unsigned long vsize = vma->vm_end - vma->vm_start; unsigned long vsize = vma->vm_end - vma->vm_start;
struct inode *inode = vma->vm_file->f_dentry->d_inode; struct inode *inode = file_inode(vma->vm_file);
struct dma_mapping *dma_map; struct dma_mapping *dma_map;
struct genwqe_dev *cd = container_of(inode->i_cdev, struct genwqe_dev, struct genwqe_dev *cd = container_of(inode->i_cdev, struct genwqe_dev,
cdev_genwqe); cdev_genwqe);
......
...@@ -136,8 +136,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp) ...@@ -136,8 +136,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp)
if (rc) if (rc)
module_put(THIS_MODULE); module_put(THIS_MODULE);
pr_debug("open file '/dev/%s' with return code %d\n", pr_debug("open file '/dev/%pD' with return code %d\n", fp, rc);
fp->f_dentry->d_name.name, rc);
return rc; return rc;
} }
...@@ -146,7 +145,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp) ...@@ -146,7 +145,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp)
*/ */
static int hmcdrv_dev_release(struct inode *inode, struct file *fp) static int hmcdrv_dev_release(struct inode *inode, struct file *fp)
{ {
pr_debug("closing file '/dev/%s'\n", fp->f_dentry->d_name.name); pr_debug("closing file '/dev/%pD'\n", fp);
kfree(fp->private_data); kfree(fp->private_data);
fp->private_data = NULL; fp->private_data = NULL;
hmcdrv_ftp_shutdown(); hmcdrv_ftp_shutdown();
...@@ -231,8 +230,8 @@ static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf, ...@@ -231,8 +230,8 @@ static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf,
retlen = hmcdrv_dev_transfer((char *) fp->private_data, retlen = hmcdrv_dev_transfer((char *) fp->private_data,
*pos, ubuf, len); *pos, ubuf, len);
pr_debug("read from file '/dev/%s' at %lld returns %zd/%zu\n", pr_debug("read from file '/dev/%pD' at %lld returns %zd/%zu\n",
fp->f_dentry->d_name.name, (long long) *pos, retlen, len); fp, (long long) *pos, retlen, len);
if (retlen > 0) if (retlen > 0)
*pos += retlen; *pos += retlen;
...@@ -248,8 +247,8 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf, ...@@ -248,8 +247,8 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,
{ {
ssize_t retlen; ssize_t retlen;
pr_debug("writing file '/dev/%s' at pos. %lld with length %zd\n", pr_debug("writing file '/dev/%pD' at pos. %lld with length %zd\n",
fp->f_dentry->d_name.name, (long long) *pos, len); fp, (long long) *pos, len);
if (!fp->private_data) { /* first expect a cmd write */ if (!fp->private_data) { /* first expect a cmd write */
fp->private_data = kmalloc(len + 1, GFP_KERNEL); fp->private_data = kmalloc(len + 1, GFP_KERNEL);
...@@ -272,8 +271,7 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf, ...@@ -272,8 +271,7 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,
if (retlen > 0) if (retlen > 0)
*pos += retlen; *pos += retlen;
pr_debug("write to file '/dev/%s' returned %zd\n", pr_debug("write to file '/dev/%pD' returned %zd\n", fp, retlen);
fp->f_dentry->d_name.name, retlen);
return retlen; return retlen;
} }
......
...@@ -968,8 +968,8 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file) ...@@ -968,8 +968,8 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file)
goto out; goto out;
/* Round to page boundary */ /* Round to page boundary */
printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n", printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%pD\n",
__func__, _dump_buf_dif, file->f_dentry->d_name.name); __func__, _dump_buf_dif, file);
debug->buffer = _dump_buf_dif; debug->buffer = _dump_buf_dif;
if (!debug->buffer) { if (!debug->buffer) {
kfree(debug); kfree(debug);
......
...@@ -826,8 +826,8 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode, ...@@ -826,8 +826,8 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
struct dentry *dir_dentry; struct dentry *dir_dentry;
struct posix_acl *dacl = NULL, *pacl = NULL; struct posix_acl *dacl = NULL, *pacl = NULL;
p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %hx MAJOR: %u MINOR: %u\n",
dir->i_ino, dentry->d_name.name, omode, dir->i_ino, dentry, omode,
MAJOR(rdev), MINOR(rdev)); MAJOR(rdev), MINOR(rdev));
if (!new_valid_dev(rdev)) if (!new_valid_dev(rdev))
......
...@@ -348,9 +348,9 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3 ...@@ -348,9 +348,9 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
u32 block = 0; u32 block = 0;
int retval; int retval;
pr_debug("%s(dir=%u, inode=%u, \"%*s\", type=%d)\n", pr_debug("%s(dir=%u, inode=%u, \"%pd\", type=%d)\n",
__func__, (u32)dir->i_ino, __func__, (u32)dir->i_ino,
(u32)inode->i_ino, (int)dentry->d_name.len, dentry->d_name.name, type); (u32)inode->i_ino, dentry, type);
retval = -EIO; retval = -EIO;
bh = affs_bread(sb, inode->i_ino); bh = affs_bread(sb, inode->i_ino);
......
...@@ -190,8 +190,7 @@ affs_find_entry(struct inode *dir, struct dentry *dentry) ...@@ -190,8 +190,7 @@ affs_find_entry(struct inode *dir, struct dentry *dentry)
toupper_t toupper = affs_get_toupper(sb); toupper_t toupper = affs_get_toupper(sb);
u32 key; u32 key;
pr_debug("%s(\"%.*s\")\n", pr_debug("%s(\"%pd\")\n", __func__, dentry);
__func__, (int)dentry->d_name.len, dentry->d_name.name);
bh = affs_bread(sb, dir->i_ino); bh = affs_bread(sb, dir->i_ino);
if (!bh) if (!bh)
...@@ -219,8 +218,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) ...@@ -219,8 +218,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
struct buffer_head *bh; struct buffer_head *bh;
struct inode *inode = NULL; struct inode *inode = NULL;
pr_debug("%s(\"%.*s\")\n", pr_debug("%s(\"%pd\")\n", __func__, dentry);
__func__, (int)dentry->d_name.len, dentry->d_name.name);
affs_lock_dir(dir); affs_lock_dir(dir);
bh = affs_find_entry(dir, dentry); bh = affs_find_entry(dir, dentry);
...@@ -250,9 +248,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) ...@@ -250,9 +248,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
int int
affs_unlink(struct inode *dir, struct dentry *dentry) 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, __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); return affs_remove_header(dentry);
} }
...@@ -264,9 +262,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) ...@@ -264,9 +262,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)
struct inode *inode; struct inode *inode;
int error; int error;
pr_debug("%s(%lu,\"%.*s\",0%ho)\n", pr_debug("%s(%lu,\"%pd\",0%ho)\n",
__func__, dir->i_ino, (int)dentry->d_name.len, __func__, dir->i_ino, dentry, mode);
dentry->d_name.name,mode);
inode = affs_new_inode(dir); inode = affs_new_inode(dir);
if (!inode) if (!inode)
...@@ -294,9 +291,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -294,9 +291,8 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
struct inode *inode; struct inode *inode;
int error; int error;
pr_debug("%s(%lu,\"%.*s\",0%ho)\n", pr_debug("%s(%lu,\"%pd\",0%ho)\n",
__func__, dir->i_ino, (int)dentry->d_name.len, __func__, dir->i_ino, dentry, mode);
dentry->d_name.name, mode);
inode = affs_new_inode(dir); inode = affs_new_inode(dir);
if (!inode) if (!inode)
...@@ -321,9 +317,9 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -321,9 +317,9 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
int int
affs_rmdir(struct inode *dir, struct dentry *dentry) 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, __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); return affs_remove_header(dentry);
} }
...@@ -338,9 +334,8 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) ...@@ -338,9 +334,8 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
int i, maxlen, error; int i, maxlen, error;
char c, lc; char c, lc;
pr_debug("%s(%lu,\"%.*s\" -> \"%s\")\n", pr_debug("%s(%lu,\"%pd\" -> \"%s\")\n",
__func__, dir->i_ino, (int)dentry->d_name.len, __func__, dir->i_ino, dentry, symname);
dentry->d_name.name, symname);
maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1; maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1;
inode = affs_new_inode(dir); inode = affs_new_inode(dir);
...@@ -409,9 +404,9 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ...@@ -409,9 +404,9 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
{ {
struct inode *inode = old_dentry->d_inode; 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, __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); return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
} }
...@@ -424,10 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -424,10 +419,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
int retval; int retval;
pr_debug("%s(old=%u,\"%*s\" to new=%u,\"%*s\")\n", pr_debug("%s(old=%u,\"%pd\" to new=%u,\"%pd\")\n",
__func__, (u32)old_dir->i_ino, (int)old_dentry->d_name.len, __func__, (u32)old_dir->i_ino, old_dentry,
old_dentry->d_name.name, (u32)new_dir->i_ino, (u32)new_dir->i_ino, new_dentry);
(int)new_dentry->d_name.len, new_dentry->d_name.name);
retval = affs_check_name(new_dentry->d_name.name, retval = affs_check_name(new_dentry->d_name.name,
new_dentry->d_name.len, new_dentry->d_name.len,
......
...@@ -434,7 +434,7 @@ static int afs_do_lookup(struct inode *dir, struct dentry *dentry, ...@@ -434,7 +434,7 @@ static int afs_do_lookup(struct inode *dir, struct dentry *dentry,
}; };
int ret; int ret;
_enter("{%lu},%p{%s},", dir->i_ino, dentry, dentry->d_name.name); _enter("{%lu},%p{%pd},", dir->i_ino, dentry, dentry);
/* search the directory */ /* search the directory */
ret = afs_dir_iterate(dir, &cookie.ctx, key); ret = afs_dir_iterate(dir, &cookie.ctx, key);
...@@ -466,8 +466,8 @@ static struct inode *afs_try_auto_mntpt( ...@@ -466,8 +466,8 @@ static struct inode *afs_try_auto_mntpt(
struct afs_vnode *vnode = AFS_FS_I(dir); struct afs_vnode *vnode = AFS_FS_I(dir);
struct inode *inode; struct inode *inode;
_enter("%d, %p{%s}, {%x:%u}, %p", _enter("%d, %p{%pd}, {%x:%u}, %p",
ret, dentry, devname, vnode->fid.vid, vnode->fid.vnode, key); ret, dentry, dentry, vnode->fid.vid, vnode->fid.vnode, key);
if (ret != -ENOENT || if (ret != -ENOENT ||
!test_bit(AFS_VNODE_AUTOCELL, &vnode->flags)) !test_bit(AFS_VNODE_AUTOCELL, &vnode->flags))
...@@ -502,8 +502,8 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, ...@@ -502,8 +502,8 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
vnode = AFS_FS_I(dir); vnode = AFS_FS_I(dir);
_enter("{%x:%u},%p{%s},", _enter("{%x:%u},%p{%pd},",
vnode->fid.vid, vnode->fid.vnode, dentry, dentry->d_name.name); vnode->fid.vid, vnode->fid.vnode, dentry, dentry);
ASSERTCMP(dentry->d_inode, ==, NULL); ASSERTCMP(dentry->d_inode, ==, NULL);
...@@ -589,11 +589,11 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -589,11 +589,11 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
vnode = AFS_FS_I(dentry->d_inode); vnode = AFS_FS_I(dentry->d_inode);
if (dentry->d_inode) if (dentry->d_inode)
_enter("{v={%x:%u} n=%s fl=%lx},", _enter("{v={%x:%u} n=%pd fl=%lx},",
vnode->fid.vid, vnode->fid.vnode, dentry->d_name.name, vnode->fid.vid, vnode->fid.vnode, dentry,
vnode->flags); vnode->flags);
else else
_enter("{neg n=%s}", dentry->d_name.name); _enter("{neg n=%pd}", dentry);
key = afs_request_key(AFS_FS_S(dentry->d_sb)->volume->cell); key = afs_request_key(AFS_FS_S(dentry->d_sb)->volume->cell);
if (IS_ERR(key)) if (IS_ERR(key))
...@@ -608,7 +608,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -608,7 +608,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
afs_validate(dir, key); afs_validate(dir, key);
if (test_bit(AFS_VNODE_DELETED, &dir->flags)) { if (test_bit(AFS_VNODE_DELETED, &dir->flags)) {
_debug("%s: parent dir deleted", dentry->d_name.name); _debug("%pd: parent dir deleted", dentry);
goto out_bad; goto out_bad;
} }
...@@ -626,16 +626,16 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -626,16 +626,16 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
if (!dentry->d_inode) if (!dentry->d_inode)
goto out_bad; goto out_bad;
if (is_bad_inode(dentry->d_inode)) { if (is_bad_inode(dentry->d_inode)) {
printk("kAFS: afs_d_revalidate: %s/%s has bad inode\n", printk("kAFS: afs_d_revalidate: %pd2 has bad inode\n",
parent->d_name.name, dentry->d_name.name); dentry);
goto out_bad; goto out_bad;
} }
/* if the vnode ID has changed, then the dirent points to a /* if the vnode ID has changed, then the dirent points to a
* different file */ * different file */
if (fid.vnode != vnode->fid.vnode) { if (fid.vnode != vnode->fid.vnode) {
_debug("%s: dirent changed [%u != %u]", _debug("%pd: dirent changed [%u != %u]",
dentry->d_name.name, fid.vnode, dentry, fid.vnode,
vnode->fid.vnode); vnode->fid.vnode);
goto not_found; goto not_found;
} }
...@@ -644,8 +644,8 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -644,8 +644,8 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
* been deleted and replaced, and the original vnode ID has * been deleted and replaced, and the original vnode ID has
* been reused */ * been reused */
if (fid.unique != vnode->fid.unique) { if (fid.unique != vnode->fid.unique) {
_debug("%s: file deleted (uq %u -> %u I:%u)", _debug("%pd: file deleted (uq %u -> %u I:%u)",
dentry->d_name.name, fid.unique, dentry, fid.unique,
vnode->fid.unique, vnode->fid.unique,
dentry->d_inode->i_generation); dentry->d_inode->i_generation);
spin_lock(&vnode->lock); spin_lock(&vnode->lock);
...@@ -657,14 +657,14 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -657,14 +657,14 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
case -ENOENT: case -ENOENT:
/* the filename is unknown */ /* the filename is unknown */
_debug("%s: dirent not found", dentry->d_name.name); _debug("%pd: dirent not found", dentry);
if (dentry->d_inode) if (dentry->d_inode)
goto not_found; goto not_found;
goto out_valid; goto out_valid;
default: default:
_debug("failed to iterate dir %s: %d", _debug("failed to iterate dir %pd: %d",
parent->d_name.name, ret); parent, ret);
goto out_bad; goto out_bad;
} }
...@@ -682,8 +682,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -682,8 +682,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
out_bad: out_bad:
_debug("dropping dentry %s/%s", _debug("dropping dentry %pd2", dentry);
parent->d_name.name, dentry->d_name.name);
dput(parent); dput(parent);
key_put(key); key_put(key);
...@@ -699,7 +698,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) ...@@ -699,7 +698,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
*/ */
static int afs_d_delete(const struct dentry *dentry) static int afs_d_delete(const struct dentry *dentry)
{ {
_enter("%s", dentry->d_name.name); _enter("%pd", dentry);
if (dentry->d_flags & DCACHE_NFSFS_RENAMED) if (dentry->d_flags & DCACHE_NFSFS_RENAMED)
goto zap; goto zap;
...@@ -722,7 +721,7 @@ static int afs_d_delete(const struct dentry *dentry) ...@@ -722,7 +721,7 @@ static int afs_d_delete(const struct dentry *dentry)
*/ */
static void afs_d_release(struct dentry *dentry) static void afs_d_release(struct dentry *dentry)
{ {
_enter("%s", dentry->d_name.name); _enter("%pd", dentry);
} }
/* /*
...@@ -741,8 +740,8 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -741,8 +740,8 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%s},%ho", _enter("{%x:%u},{%pd},%ho",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode); dvnode->fid.vid, dvnode->fid.vnode, dentry, mode);
key = afs_request_key(dvnode->volume->cell); key = afs_request_key(dvnode->volume->cell);
if (IS_ERR(key)) { if (IS_ERR(key)) {
...@@ -802,8 +801,8 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry) ...@@ -802,8 +801,8 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%s}", _enter("{%x:%u},{%pd}",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name); dvnode->fid.vid, dvnode->fid.vnode, dentry);
key = afs_request_key(dvnode->volume->cell); key = afs_request_key(dvnode->volume->cell);
if (IS_ERR(key)) { if (IS_ERR(key)) {
...@@ -844,8 +843,8 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry) ...@@ -844,8 +843,8 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%s}", _enter("{%x:%u},{%pd}",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name); dvnode->fid.vid, dvnode->fid.vnode, dentry);
ret = -ENAMETOOLONG; ret = -ENAMETOOLONG;
if (dentry->d_name.len >= AFSNAMEMAX) if (dentry->d_name.len >= AFSNAMEMAX)
...@@ -918,8 +917,8 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ...@@ -918,8 +917,8 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%s},%ho,", _enter("{%x:%u},{%pd},%ho,",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode); dvnode->fid.vid, dvnode->fid.vnode, dentry, mode);
key = afs_request_key(dvnode->volume->cell); key = afs_request_key(dvnode->volume->cell);
if (IS_ERR(key)) { if (IS_ERR(key)) {
...@@ -981,10 +980,10 @@ static int afs_link(struct dentry *from, struct inode *dir, ...@@ -981,10 +980,10 @@ static int afs_link(struct dentry *from, struct inode *dir,
vnode = AFS_FS_I(from->d_inode); vnode = AFS_FS_I(from->d_inode);
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%x:%u},{%s}", _enter("{%x:%u},{%x:%u},{%pd}",
vnode->fid.vid, vnode->fid.vnode, vnode->fid.vid, vnode->fid.vnode,
dvnode->fid.vid, dvnode->fid.vnode, dvnode->fid.vid, dvnode->fid.vnode,
dentry->d_name.name); dentry);
key = afs_request_key(dvnode->volume->cell); key = afs_request_key(dvnode->volume->cell);
if (IS_ERR(key)) { if (IS_ERR(key)) {
...@@ -1026,8 +1025,8 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, ...@@ -1026,8 +1025,8 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry,
dvnode = AFS_FS_I(dir); dvnode = AFS_FS_I(dir);
_enter("{%x:%u},{%s},%s", _enter("{%x:%u},{%pd},%s",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, dvnode->fid.vid, dvnode->fid.vnode, dentry,
content); content);
ret = -EINVAL; ret = -EINVAL;
...@@ -1094,11 +1093,11 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1094,11 +1093,11 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,
orig_dvnode = AFS_FS_I(old_dir); orig_dvnode = AFS_FS_I(old_dir);
new_dvnode = AFS_FS_I(new_dir); new_dvnode = AFS_FS_I(new_dir);
_enter("{%x:%u},{%x:%u},{%x:%u},{%s}", _enter("{%x:%u},{%x:%u},{%x:%u},{%pd}",
orig_dvnode->fid.vid, orig_dvnode->fid.vnode, orig_dvnode->fid.vid, orig_dvnode->fid.vnode,
vnode->fid.vid, vnode->fid.vnode, vnode->fid.vid, vnode->fid.vnode,
new_dvnode->fid.vid, new_dvnode->fid.vnode, new_dvnode->fid.vid, new_dvnode->fid.vnode,
new_dentry->d_name.name); new_dentry);
key = afs_request_key(orig_dvnode->volume->cell); key = afs_request_key(orig_dvnode->volume->cell);
if (IS_ERR(key)) { if (IS_ERR(key)) {
......
...@@ -462,8 +462,8 @@ int afs_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -462,8 +462,8 @@ int afs_setattr(struct dentry *dentry, struct iattr *attr)
struct key *key; struct key *key;