Commit 4b8e9923 authored by Al Viro's avatar Al Viro

9p: switch to %p[dD]

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 35c265e0
...@@ -65,8 +65,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) ...@@ -65,8 +65,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
{ {
struct p9_fid *fid, *ret; struct p9_fid *fid, *ret;
p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n", p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p) uid %d any %d\n",
dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid), dentry, dentry, from_kuid(&init_user_ns, uid),
any); any);
ret = NULL; ret = NULL;
/* we'll recheck under lock if there's anything to look in */ /* we'll recheck under lock if there's anything to look in */
......
...@@ -266,8 +266,8 @@ v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos) ...@@ -266,8 +266,8 @@ v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
* Now that we do caching with cache mode enabled, We need * Now that we do caching with cache mode enabled, We need
* to support direct IO * to support direct IO
*/ */
p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%s) off/no(%lld/%lu) EINVAL\n", p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%pD) off/no(%lld/%lu) EINVAL\n",
iocb->ki_filp->f_path.dentry->d_name.name, iocb->ki_filp,
(long long)pos, iter->nr_segs); (long long)pos, iter->nr_segs);
return -EINVAL; return -EINVAL;
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
*/ */
static int v9fs_cached_dentry_delete(const struct dentry *dentry) static int v9fs_cached_dentry_delete(const struct dentry *dentry)
{ {
p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n", p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",
dentry->d_name.name, dentry); dentry, dentry);
/* Don't cache negative dentries */ /* Don't cache negative dentries */
if (!dentry->d_inode) if (!dentry->d_inode)
...@@ -67,8 +67,8 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry) ...@@ -67,8 +67,8 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry)
static void v9fs_dentry_release(struct dentry *dentry) static void v9fs_dentry_release(struct dentry *dentry)
{ {
struct hlist_node *p, *n; struct hlist_node *p, *n;
p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n", p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",
dentry->d_name.name, dentry); dentry, dentry);
hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata) hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)
p9_client_clunk(hlist_entry(p, struct p9_fid, dlist)); p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));
dentry->d_fsdata = NULL; dentry->d_fsdata = NULL;
......
...@@ -116,7 +116,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx) ...@@ -116,7 +116,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx)
int reclen = 0; int reclen = 0;
struct p9_rdir *rdir; struct p9_rdir *rdir;
p9_debug(P9_DEBUG_VFS, "name %s\n", file->f_path.dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "name %pD\n", file);
fid = file->private_data; fid = file->private_data;
buflen = fid->clnt->msize - P9_IOHDRSZ; buflen = fid->clnt->msize - P9_IOHDRSZ;
...@@ -172,7 +172,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx) ...@@ -172,7 +172,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx)
struct p9_rdir *rdir; struct p9_rdir *rdir;
struct p9_dirent curdirent; struct p9_dirent curdirent;
p9_debug(P9_DEBUG_VFS, "name %s\n", file->f_path.dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "name %pD\n", file);
fid = file->private_data; fid = file->private_data;
buflen = fid->clnt->msize - P9_READDIRHDRSZ; buflen = fid->clnt->msize - P9_READDIRHDRSZ;
......
...@@ -301,8 +301,8 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl) ...@@ -301,8 +301,8 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl)
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
int ret = -ENOLCK; int ret = -ENOLCK;
p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %s\n", p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",
filp, cmd, fl, filp->f_path.dentry->d_name.name); filp, cmd, fl, filp);
/* No mandatory locks */ /* No mandatory locks */
if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
...@@ -337,8 +337,8 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd, ...@@ -337,8 +337,8 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd,
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
int ret = -ENOLCK; int ret = -ENOLCK;
p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %s\n", p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",
filp, cmd, fl, filp->f_path.dentry->d_name.name); filp, cmd, fl, filp);
/* No mandatory locks */ /* No mandatory locks */
if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
......
...@@ -648,7 +648,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, ...@@ -648,7 +648,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
struct p9_fid *dfid, *ofid, *fid; struct p9_fid *dfid, *ofid, *fid;
struct inode *inode; struct inode *inode;
p9_debug(P9_DEBUG_VFS, "name %s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "name %pd\n", dentry);
err = 0; err = 0;
ofid = NULL; ofid = NULL;
...@@ -755,7 +755,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode ...@@ -755,7 +755,7 @@ static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
struct p9_fid *fid; struct p9_fid *fid;
struct v9fs_session_info *v9ses; struct v9fs_session_info *v9ses;
p9_debug(P9_DEBUG_VFS, "name %s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "name %pd\n", dentry);
err = 0; err = 0;
v9ses = v9fs_inode2v9ses(dir); v9ses = v9fs_inode2v9ses(dir);
perm = unixmode2p9mode(v9ses, mode | S_IFDIR); perm = unixmode2p9mode(v9ses, mode | S_IFDIR);
...@@ -791,8 +791,8 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, ...@@ -791,8 +791,8 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
struct inode *inode; struct inode *inode;
char *name; char *name;
p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p flags: %x\n", p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%pd) %p flags: %x\n",
dir, dentry->d_name.name, dentry, flags); dir, dentry, dentry, flags);
if (dentry->d_name.len > NAME_MAX) if (dentry->d_name.len > NAME_MAX)
return ERR_PTR(-ENAMETOOLONG); return ERR_PTR(-ENAMETOOLONG);
...@@ -1239,7 +1239,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) ...@@ -1239,7 +1239,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
struct p9_fid *fid; struct p9_fid *fid;
struct p9_wstat *st; struct p9_wstat *st;
p9_debug(P9_DEBUG_VFS, " %s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, " %pd\n", dentry);
retval = -EPERM; retval = -EPERM;
v9ses = v9fs_dentry2v9ses(dentry); v9ses = v9fs_dentry2v9ses(dentry);
fid = v9fs_fid_lookup(dentry); fid = v9fs_fid_lookup(dentry);
...@@ -1262,8 +1262,8 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) ...@@ -1262,8 +1262,8 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
retval = min(strlen(st->extension)+1, (size_t)buflen); retval = min(strlen(st->extension)+1, (size_t)buflen);
memcpy(buffer, st->extension, retval); memcpy(buffer, st->extension, retval);
p9_debug(P9_DEBUG_VFS, "%s -> %s (%.*s)\n", p9_debug(P9_DEBUG_VFS, "%pd -> %s (%.*s)\n",
dentry->d_name.name, st->extension, buflen, buffer); dentry, st->extension, buflen, buffer);
done: done:
p9stat_free(st); p9stat_free(st);
...@@ -1283,7 +1283,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) ...@@ -1283,7 +1283,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
int len = 0; int len = 0;
char *link = __getname(); char *link = __getname();
p9_debug(P9_DEBUG_VFS, "%s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "%pd\n", dentry);
if (!link) if (!link)
link = ERR_PTR(-ENOMEM); link = ERR_PTR(-ENOMEM);
...@@ -1314,8 +1314,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) ...@@ -1314,8 +1314,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{ {
char *s = nd_get_link(nd); char *s = nd_get_link(nd);
p9_debug(P9_DEBUG_VFS, " %s %s\n", p9_debug(P9_DEBUG_VFS, " %pd %s\n",
dentry->d_name.name, IS_ERR(s) ? "<error>" : s); dentry, IS_ERR(s) ? "<error>" : s);
if (!IS_ERR(s)) if (!IS_ERR(s))
__putname(s); __putname(s);
} }
...@@ -1364,8 +1364,8 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry, ...@@ -1364,8 +1364,8 @@ static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry,
static int static int
v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
{ {
p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n", p9_debug(P9_DEBUG_VFS, " %lu,%pd,%s\n",
dir->i_ino, dentry->d_name.name, symname); dir->i_ino, dentry, symname);
return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname); return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
} }
...@@ -1386,8 +1386,8 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir, ...@@ -1386,8 +1386,8 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
char *name; char *name;
struct p9_fid *oldfid; struct p9_fid *oldfid;
p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n", p9_debug(P9_DEBUG_VFS, " %lu,%pd,%pd\n",
dir->i_ino, dentry->d_name.name, old_dentry->d_name.name); dir->i_ino, dentry, old_dentry);
oldfid = v9fs_fid_clone(old_dentry); oldfid = v9fs_fid_clone(old_dentry);
if (IS_ERR(oldfid)) if (IS_ERR(oldfid))
...@@ -1428,8 +1428,8 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rde ...@@ -1428,8 +1428,8 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rde
char *name; char *name;
u32 perm; u32 perm;
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, mode, dir->i_ino, dentry, mode,
MAJOR(rdev), MINOR(rdev)); MAJOR(rdev), MINOR(rdev));
if (!new_valid_dev(rdev)) if (!new_valid_dev(rdev))
......
...@@ -393,7 +393,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir, ...@@ -393,7 +393,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
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, "name %s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "name %pd\n", dentry);
err = 0; err = 0;
v9ses = v9fs_inode2v9ses(dir); v9ses = v9fs_inode2v9ses(dir);
...@@ -767,8 +767,8 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir, ...@@ -767,8 +767,8 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
struct p9_fid *dfid, *oldfid; struct p9_fid *dfid, *oldfid;
struct v9fs_session_info *v9ses; struct v9fs_session_info *v9ses;
p9_debug(P9_DEBUG_VFS, "dir ino: %lu, old_name: %s, new_name: %s\n", p9_debug(P9_DEBUG_VFS, "dir ino: %lu, old_name: %pd, new_name: %pd\n",
dir->i_ino, old_dentry->d_name.name, dentry->d_name.name); dir->i_ino, old_dentry, dentry);
v9ses = v9fs_inode2v9ses(dir); v9ses = v9fs_inode2v9ses(dir);
dir_dentry = dentry->d_parent; dir_dentry = dentry->d_parent;
...@@ -917,7 +917,7 @@ v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd) ...@@ -917,7 +917,7 @@ v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
char *link = __getname(); char *link = __getname();
char *target; char *target;
p9_debug(P9_DEBUG_VFS, "%s\n", dentry->d_name.name); p9_debug(P9_DEBUG_VFS, "%pd\n", dentry);
if (!link) { if (!link) {
link = ERR_PTR(-ENOMEM); link = ERR_PTR(-ENOMEM);
......
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