git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
smbfs
/
symlink.c
diff --git
a/fs/smbfs/symlink.c
b/fs/smbfs/symlink.c
index
8b069e0
..
cdc53c4
100644
(file)
--- a/
fs/smbfs/symlink.c
+++ b/
fs/smbfs/symlink.c
@@
-34,7
+34,7
@@
int smb_symlink(struct inode *inode, struct dentry *dentry, const char *oldname)
return smb_proc_symlink(server_from_dentry(dentry), dentry, oldname);
}
return smb_proc_symlink(server_from_dentry(dentry), dentry, oldname);
}
-static
int
smb_follow_link(struct dentry *dentry, struct nameidata *nd)
+static
void *
smb_follow_link(struct dentry *dentry, struct nameidata *nd)
{
char *link = __getname();
DEBUG1("followlink of %s/%s\n", DENTRY_PATH(dentry));
{
char *link = __getname();
DEBUG1("followlink of %s/%s\n", DENTRY_PATH(dentry));
@@
-45,21
+45,21
@@
static int smb_follow_link(struct dentry *dentry, struct nameidata *nd)
int len = smb_proc_read_link(server_from_dentry(dentry),
dentry, link, PATH_MAX - 1);
if (len < 0) {
int len = smb_proc_read_link(server_from_dentry(dentry),
dentry, link, PATH_MAX - 1);
if (len < 0) {
- putname(link);
+
__
putname(link);
link = ERR_PTR(len);
} else {
link[len] = 0;
}
}
nd_set_link(nd, link);
link = ERR_PTR(len);
} else {
link[len] = 0;
}
}
nd_set_link(nd, link);
- return
0
;
+ return
NULL
;
}
}
-static void smb_put_link(struct dentry *dentry, struct nameidata *nd)
+static void smb_put_link(struct dentry *dentry, struct nameidata *nd
, void *p
)
{
char *s = nd_get_link(nd);
if (!IS_ERR(s))
{
char *s = nd_get_link(nd);
if (!IS_ERR(s))
- putname(s);
+
__
putname(s);
}
struct inode_operations smb_link_inode_operations =
}
struct inode_operations smb_link_inode_operations =