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

Commit 7dd0cdc5 authored by Wu Fengguang's avatar Wu Fengguang Committed by Eric Van Hensbergen
Browse files

9p: convert d_iname references to d_name.name 



d_iname is rubbish for long file names.
Use d_name.name in printks instead.

Signed-off-by: default avatarWu Fengguang <wfg@linux.intel.com>
Acked-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 6ff23207

fs/9p/fid.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid) 
	struct v9fs_dentry *dent;



	P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n",

					fid->fid, dentry->d_iname);

					fid->fid, dentry->d_name.name);



	dent = dentry->d_fsdata;

	if (!dent) {
@@ -79,7 +79,7 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, u32 uid, int any) 
	struct p9_fid *fid, *ret;



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

		dentry->d_iname, dentry, uid, any);

		dentry->d_name.name, dentry, uid, any);

	dent = (struct v9fs_dentry *) dentry->d_fsdata;

	ret = NULL;

	if (dent) {

fs/9p/vfs_dentry.c

+6 −3
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ 


static int v9fs_dentry_delete(struct dentry *dentry)

{

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,

									dentry);



	return 1;

}
@@ -69,7 +70,8 @@ static int v9fs_dentry_delete(struct dentry *dentry) 
static int v9fs_cached_dentry_delete(struct dentry *dentry)

{

	struct inode *inode = dentry->d_inode;

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,

									dentry);



	if(!inode)

		return 1;
@@ -88,7 +90,8 @@ void v9fs_dentry_release(struct dentry *dentry) 
	struct v9fs_dentry *dent;

	struct p9_fid *temp, *current_fid;



	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,

									dentry);

	dent = dentry->d_fsdata;

	if (dent) {

		list_for_each_entry_safe(current_fid, temp, &dent->fidlist,

fs/9p/vfs_inode.c

+2 −1
Original line number Diff line number Diff line
@@ -963,7 +963,8 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer, 
	if (buflen > PATH_MAX)

		buflen = PATH_MAX;



	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);

	P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,

									dentry);



	retval = v9fs_readlink(dentry, link, buflen);