Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+13
-8
+2
-2
fs/9p/fid.c
+2
-2
fs/9p/fid.c
···
45
45
struct v9fs_dentry *dent;
46
46
47
47
P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n",
48
-
fid->fid, dentry->d_iname);
48
+
fid->fid, dentry->d_name.name);
49
49
50
50
dent = dentry->d_fsdata;
51
51
if (!dent) {
···
79
79
struct p9_fid *fid, *ret;
80
80
81
81
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",
82
-
dentry->d_iname, dentry, uid, any);
82
+
dentry->d_name.name, dentry, uid, any);
83
83
dent = (struct v9fs_dentry *) dentry->d_fsdata;
84
84
ret = NULL;
85
85
if (dent) {
+1
-1
fs/9p/v9fs.c
+1
-1
fs/9p/v9fs.c
+6
-3
fs/9p/vfs_dentry.c
+6
-3
fs/9p/vfs_dentry.c
···
52
52
53
53
static int v9fs_dentry_delete(struct dentry *dentry)
54
54
{
55
-
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
55
+
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
56
+
dentry);
56
57
57
58
return 1;
58
59
}
···
70
69
static int v9fs_cached_dentry_delete(struct dentry *dentry)
71
70
{
72
71
struct inode *inode = dentry->d_inode;
73
-
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
72
+
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
73
+
dentry);
74
74
75
75
if(!inode)
76
76
return 1;
···
90
88
struct v9fs_dentry *dent;
91
89
struct p9_fid *temp, *current_fid;
92
90
93
-
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
91
+
P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
92
+
dentry);
94
93
dent = dentry->d_fsdata;
95
94
if (dent) {
96
95
list_for_each_entry_safe(current_fid, temp, &dent->fidlist,
+4
-2
fs/9p/vfs_inode.c
+4
-2
fs/9p/vfs_inode.c
···
963
963
if (buflen > PATH_MAX)
964
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
969
retval = v9fs_readlink(dentry, link, buflen);
969
970
···
1023
1022
{
1024
1023
char *s = nd_get_link(nd);
1025
1024
1026
-
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, s);
1025
+
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
1026
+
IS_ERR(s) ? "<error>" : s);
1027
1027
if (!IS_ERR(s))
1028
1028
__putname(s);
1029
1029
}