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
/
afs
/
mntpt.c
diff --git
a/fs/afs/mntpt.c
b/fs/afs/mntpt.c
index
bfc28ab
..
4e6eeb5
100644
(file)
--- a/
fs/afs/mntpt.c
+++ b/
fs/afs/mntpt.c
@@
-30,9
+30,9
@@
static struct dentry *afs_mntpt_lookup(struct inode *dir,
struct dentry *dentry,
struct nameidata *nd);
static int afs_mntpt_open(struct inode *inode, struct file *file);
struct dentry *dentry,
struct nameidata *nd);
static int afs_mntpt_open(struct inode *inode, struct file *file);
-static
int
afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
+static
void *
afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
-struct file_operations afs_mntpt_file_operations = {
+
const
struct file_operations afs_mntpt_file_operations = {
.open = afs_mntpt_open,
};
.open = afs_mntpt_open,
};
@@
-233,7
+233,7
@@
static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
/*
* follow a link from a mountpoint directory, thus causing it to be mounted
*/
/*
* follow a link from a mountpoint directory, thus causing it to be mounted
*/
-static
int
afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
+static
void *
afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
{
struct vfsmount *newmnt;
struct dentry *old_dentry;
{
struct vfsmount *newmnt;
struct dentry *old_dentry;
@@
-249,7
+249,7
@@
static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
newmnt = afs_mntpt_do_automount(dentry);
if (IS_ERR(newmnt)) {
path_release(nd);
newmnt = afs_mntpt_do_automount(dentry);
if (IS_ERR(newmnt)) {
path_release(nd);
- return
PTR_ERR(newmnt)
;
+ return
(void *)newmnt
;
}
old_dentry = nd->dentry;
}
old_dentry = nd->dentry;
@@
-267,7
+267,7
@@
static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
}
kleave(" = %d", err);
}
kleave(" = %d", err);
- return
err
;
+ return
ERR_PTR(err)
;
} /* end afs_mntpt_follow_link() */
/*****************************************************************************/
} /* end afs_mntpt_follow_link() */
/*****************************************************************************/