Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

9p: switch to %p[dD] 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 35c265e0

fs/9p/fid.c

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) 
{

	struct p9_fid *fid, *ret;



	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",

		 dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid),

	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p) uid %d any %d\n",

		 dentry, dentry, from_kuid(&init_user_ns, uid),

		 any);

	ret = NULL;

	/* we'll recheck under lock if there's anything to look in */

fs/9p/vfs_addr.c

+2 −2
Original line number Diff line number Diff line
@@ -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

	 * to support direct IO

	 */

	p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%s) off/no(%lld/%lu) EINVAL\n",

		 iocb->ki_filp->f_path.dentry->d_name.name,

	p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%pD) off/no(%lld/%lu) EINVAL\n",

		 iocb->ki_filp,

		 (long long)pos, iter->nr_segs);



	return -EINVAL;

fs/9p/vfs_dentry.c

+4 −4
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 
 */

static int v9fs_cached_dentry_delete(const struct dentry *dentry)

{

	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",

		 dentry->d_name.name, dentry);

	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",

		 dentry, dentry);



	/* Don't cache negative dentries */

	if (!dentry->d_inode)
@@ -67,8 +67,8 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry) 
static void v9fs_dentry_release(struct dentry *dentry)

{

	struct hlist_node *p, *n;

	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",

		 dentry->d_name.name, dentry);

	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",

		 dentry, dentry);

	hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)

		p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));

	dentry->d_fsdata = NULL;

fs/9p/vfs_dir.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx) 
	int reclen = 0;

	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;



	buflen = fid->clnt->msize - P9_IOHDRSZ;
@@ -172,7 +172,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx) 
	struct p9_rdir *rdir;

	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;



	buflen = fid->clnt->msize - P9_READDIRHDRSZ;

fs/9p/vfs_file.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

	int ret = -ENOLCK;



	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %s\n",

		 filp, cmd, fl, filp->f_path.dentry->d_name.name);

	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",

		 filp, cmd, fl, filp);



	/* No mandatory locks */

	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
@@ -337,8 +337,8 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd, 
	struct inode *inode = file_inode(filp);

	int ret = -ENOLCK;



	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %s\n",

		 filp, cmd, fl, filp->f_path.dentry->d_name.name);

	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",

		 filp, cmd, fl, filp);



	/* No mandatory locks */

	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)