diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-20 14:07:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-20 14:07:31 -0500 |
commit | ab65387243f47a7bc11725f733c86bf27248b326 (patch) | |
tree | 0857b074b984b1e1dd70d1cbabe22ee618ccd498 /fs/9p/vfs_inode.c | |
parent | e6a997eda9f76e83b7820b6e71406a43374b9f0f (diff) | |
parent | f1d9e4586e79e1fc7b26d1c567599a904013f199 (diff) |
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/vfs_inode.c')
-rw-r--r-- | fs/9p/vfs_inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 8314d3f43b71..2dfcf5487efe 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -963,7 +963,8 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer, | |||
963 | if (buflen > PATH_MAX) | 963 | if (buflen > PATH_MAX) |
964 | buflen = PATH_MAX; | 964 | buflen = PATH_MAX; |
965 | 965 | ||
966 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 966 | P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name, |
967 | dentry); | ||
967 | 968 | ||
968 | retval = v9fs_readlink(dentry, link, buflen); | 969 | retval = v9fs_readlink(dentry, link, buflen); |
969 | 970 | ||
@@ -1022,7 +1023,8 @@ v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) | |||
1022 | { | 1023 | { |
1023 | char *s = nd_get_link(nd); | 1024 | char *s = nd_get_link(nd); |
1024 | 1025 | ||
1025 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, s); | 1026 | P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
1027 | IS_ERR(s) ? "<error>" : s); | ||
1026 | if (!IS_ERR(s)) | 1028 | if (!IS_ERR(s)) |
1027 | __putname(s); | 1029 | __putname(s); |
1028 | } | 1030 | } |