Commit f66debf1 authored by Al Viro's avatar Al Viro

orangefs: use %pd/%pD

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 29b4817d
...@@ -177,8 +177,8 @@ static int orangefs_readdir(struct file *file, struct dir_context *ctx) ...@@ -177,8 +177,8 @@ static int orangefs_readdir(struct file *file, struct dir_context *ctx)
} }
gossip_debug(GOSSIP_DIR_DEBUG, gossip_debug(GOSSIP_DIR_DEBUG,
"orangefs_readdir called on %s (pos=%llu)\n", "orangefs_readdir called on %pd (pos=%llu)\n",
dentry->d_name.name, llu(pos)); dentry, llu(pos));
memset(&readdir_response, 0, sizeof(readdir_response)); memset(&readdir_response, 0, sizeof(readdir_response));
......
...@@ -585,8 +585,8 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -585,8 +585,8 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma)
static int orangefs_file_release(struct inode *inode, struct file *file) static int orangefs_file_release(struct inode *inode, struct file *file)
{ {
gossip_debug(GOSSIP_FILE_DEBUG, gossip_debug(GOSSIP_FILE_DEBUG,
"orangefs_file_release: called on %s\n", "orangefs_file_release: called on %pD\n",
file->f_path.dentry->d_name.name); file);
orangefs_flush_inode(inode); orangefs_flush_inode(inode);
......
...@@ -129,8 +129,8 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb, ...@@ -129,8 +129,8 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb,
struct iov_iter *iter) struct iov_iter *iter)
{ {
gossip_debug(GOSSIP_INODE_DEBUG, gossip_debug(GOSSIP_INODE_DEBUG,
"orangefs_direct_IO: %s\n", "orangefs_direct_IO: %pD\n",
iocb->ki_filp->f_path.dentry->d_name.name); iocb->ki_filp);
return -EINVAL; return -EINVAL;
} }
...@@ -216,8 +216,8 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr) ...@@ -216,8 +216,8 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
gossip_debug(GOSSIP_INODE_DEBUG, gossip_debug(GOSSIP_INODE_DEBUG,
"orangefs_setattr: called on %s\n", "orangefs_setattr: called on %pd\n",
dentry->d_name.name); dentry);
ret = inode_change_ok(inode, iattr); ret = inode_change_ok(inode, iattr);
if (ret) if (ret)
...@@ -259,8 +259,8 @@ int orangefs_getattr(struct vfsmount *mnt, ...@@ -259,8 +259,8 @@ int orangefs_getattr(struct vfsmount *mnt,
struct orangefs_inode_s *orangefs_inode = NULL; struct orangefs_inode_s *orangefs_inode = NULL;
gossip_debug(GOSSIP_INODE_DEBUG, gossip_debug(GOSSIP_INODE_DEBUG,
"orangefs_getattr: called on %s\n", "orangefs_getattr: called on %pd\n",
dentry->d_name.name); dentry);
ret = orangefs_inode_getattr(inode, 0, 0); ret = orangefs_inode_getattr(inode, 0, 0);
if (ret == 0) { if (ret == 0) {
......
...@@ -24,9 +24,9 @@ static int orangefs_create(struct inode *dir, ...@@ -24,9 +24,9 @@ static int orangefs_create(struct inode *dir,
struct inode *inode; struct inode *inode;
int ret; int ret;
gossip_debug(GOSSIP_NAME_DEBUG, "%s: %s\n", gossip_debug(GOSSIP_NAME_DEBUG, "%s: %pd\n",
__func__, __func__,
dentry->d_name.name); dentry);
new_op = op_alloc(ORANGEFS_VFS_OP_CREATE); new_op = op_alloc(ORANGEFS_VFS_OP_CREATE);
if (!new_op) if (!new_op)
...@@ -43,9 +43,9 @@ static int orangefs_create(struct inode *dir, ...@@ -43,9 +43,9 @@ static int orangefs_create(struct inode *dir,
ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"%s: %s: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n", "%s: %pd: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n",
__func__, __func__,
dentry->d_name.name, dentry,
&new_op->downcall.resp.create.refn.khandle, &new_op->downcall.resp.create.refn.khandle,
new_op->downcall.resp.create.refn.fs_id, new_op->downcall.resp.create.refn.fs_id,
new_op, new_op,
...@@ -57,18 +57,18 @@ static int orangefs_create(struct inode *dir, ...@@ -57,18 +57,18 @@ static int orangefs_create(struct inode *dir,
inode = orangefs_new_inode(dir->i_sb, dir, S_IFREG | mode, 0, inode = orangefs_new_inode(dir->i_sb, dir, S_IFREG | mode, 0,
&new_op->downcall.resp.create.refn); &new_op->downcall.resp.create.refn);
if (IS_ERR(inode)) { if (IS_ERR(inode)) {
gossip_err("%s: Failed to allocate inode for file :%s:\n", gossip_err("%s: Failed to allocate inode for file :%pd:\n",
__func__, __func__,
dentry->d_name.name); dentry);
ret = PTR_ERR(inode); ret = PTR_ERR(inode);
goto out; goto out;
} }
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"%s: Assigned inode :%pU: for file :%s:\n", "%s: Assigned inode :%pU: for file :%pd:\n",
__func__, __func__,
get_khandle_from_ino(inode), get_khandle_from_ino(inode),
dentry->d_name.name); dentry);
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
unlock_new_inode(inode); unlock_new_inode(inode);
...@@ -76,9 +76,9 @@ static int orangefs_create(struct inode *dir, ...@@ -76,9 +76,9 @@ static int orangefs_create(struct inode *dir,
ORANGEFS_I(inode)->getattr_time = jiffies - 1; ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"%s: dentry instantiated for %s\n", "%s: dentry instantiated for %pd\n",
__func__, __func__,
dentry->d_name.name); dentry);
SetMtimeFlag(parent); SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb); dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
...@@ -87,9 +87,9 @@ static int orangefs_create(struct inode *dir, ...@@ -87,9 +87,9 @@ static int orangefs_create(struct inode *dir,
out: out:
op_release(new_op); op_release(new_op);
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"%s: %s: returning %d\n", "%s: %pd: returning %d\n",
__func__, __func__,
dentry->d_name.name, dentry,
ret); ret);
return ret; return ret;
} }
...@@ -115,8 +115,8 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry, ...@@ -115,8 +115,8 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
* -EEXIST on O_EXCL opens, which is broken if we skip this lookup * -EEXIST on O_EXCL opens, which is broken if we skip this lookup
* in the create path) * in the create path)
*/ */
gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %s\n", gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %pd\n",
__func__, dentry->d_name.name); __func__, dentry);
if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1)) if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1))
return ERR_PTR(-ENAMETOOLONG); return ERR_PTR(-ENAMETOOLONG);
...@@ -169,9 +169,9 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry, ...@@ -169,9 +169,9 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"orangefs_lookup: Adding *negative* dentry " "orangefs_lookup: Adding *negative* dentry "
"%p for %s\n", "%p for %pd\n",
dentry, dentry,
dentry->d_name.name); dentry);
d_add(dentry, NULL); d_add(dentry, NULL);
res = NULL; res = NULL;
...@@ -224,10 +224,10 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry) ...@@ -224,10 +224,10 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry)
int ret; int ret;
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"%s: called on %s\n" "%s: called on %pd\n"
" (inode %pU): Parent is %pU | fs_id %d\n", " (inode %pU): Parent is %pU | fs_id %d\n",
__func__, __func__,
dentry->d_name.name, dentry,
get_khandle_from_ino(inode), get_khandle_from_ino(inode),
&parent->refn.khandle, &parent->refn.khandle,
parent->refn.fs_id); parent->refn.fs_id);
...@@ -326,9 +326,9 @@ static int orangefs_symlink(struct inode *dir, ...@@ -326,9 +326,9 @@ static int orangefs_symlink(struct inode *dir,
ORANGEFS_I(inode)->getattr_time = jiffies - 1; ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"Inode (Symlink) %pU -> %s\n", "Inode (Symlink) %pU -> %pd\n",
get_khandle_from_ino(inode), get_khandle_from_ino(inode),
dentry->d_name.name); dentry);
SetMtimeFlag(parent); SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb); dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
...@@ -390,9 +390,9 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode ...@@ -390,9 +390,9 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
ORANGEFS_I(inode)->getattr_time = jiffies - 1; ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG, gossip_debug(GOSSIP_NAME_DEBUG,
"Inode (Directory) %pU -> %s\n", "Inode (Directory) %pU -> %pd\n",
get_khandle_from_ino(inode), get_khandle_from_ino(inode),
dentry->d_name.name); dentry);
/* /*
* NOTE: we have no good way to keep nlink consistent for directories * NOTE: we have no good way to keep nlink consistent for directories
......
...@@ -350,8 +350,8 @@ static ssize_t orangefs_debug_write(struct file *file, ...@@ -350,8 +350,8 @@ static ssize_t orangefs_debug_write(struct file *file,
struct client_debug_mask c_mask = { NULL, 0, 0 }; struct client_debug_mask c_mask = { NULL, 0, 0 };
gossip_debug(GOSSIP_DEBUGFS_DEBUG, gossip_debug(GOSSIP_DEBUGFS_DEBUG,
"orangefs_debug_write: %s\n", "orangefs_debug_write: %pD\n",
file->f_path.dentry->d_name.name); file);
/* /*
* Thwart users who try to jamb a ridiculous number * Thwart users who try to jamb a ridiculous number
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment