diff options
| author | Linus Torvalds | 2008-12-20 20:07:31 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-12-20 20:07:31 +0100 |
| commit | ab65387243f47a7bc11725f733c86bf27248b326 (patch) | |
| tree | 0857b074b984b1e1dd70d1cbabe22ee618ccd498 /fs/9p/fid.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | fs/9p: change simple_strtol to simple_strtoul (diff) | |
| download | kernel-qcow2-linux-ab65387243f47a7bc11725f733c86bf27248b326.tar.gz kernel-qcow2-linux-ab65387243f47a7bc11725f733c86bf27248b326.tar.xz kernel-qcow2-linux-ab65387243f47a7bc11725f733c86bf27248b326.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: change simple_strtol to simple_strtoul
9p: convert d_iname references to d_name.name
9p: Remove potentially bad parameter from function entry debug print.
Diffstat (limited to 'fs/9p/fid.c')
| -rw-r--r-- | fs/9p/fid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 3031e3233dd6..2a983d49d19c 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c @@ -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) { |