mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
[PATCH] Fix up symlink function pointers
This fixes up the symlink functions for the calling convention change: * afs, autofs4, befs, devfs, freevxfs, jffs2, jfs, ncpfs, procfs, smbfs, sysvfs, ufs, xfs - prototype change for ->follow_link() * befs, smbfs, xfs - same for ->put_link() Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
cc314eef01
commit
008b150a3c
13 changed files with 37 additions and 37 deletions
|
|
@ -890,7 +890,7 @@ static struct file_operations proc_seccomp_operations = {
|
|||
};
|
||||
#endif /* CONFIG_SECCOMP */
|
||||
|
||||
static int proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
int error = -EACCES;
|
||||
|
|
@ -907,7 +907,7 @@ static int proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
|
|||
error = PROC_I(inode)->op.proc_get_link(inode, &nd->dentry, &nd->mnt);
|
||||
nd->last_type = LAST_BIND;
|
||||
out:
|
||||
return error;
|
||||
return ERR_PTR(error);
|
||||
}
|
||||
|
||||
static int do_proc_readlink(struct dentry *dentry, struct vfsmount *mnt,
|
||||
|
|
@ -1692,11 +1692,11 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
|
|||
return vfs_readlink(dentry,buffer,buflen,tmp);
|
||||
}
|
||||
|
||||
static int proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
char tmp[30];
|
||||
sprintf(tmp, "%d", current->tgid);
|
||||
return vfs_follow_link(nd,tmp);
|
||||
return ERR_PTR(vfs_follow_link(nd,tmp));
|
||||
}
|
||||
|
||||
static struct inode_operations proc_self_inode_operations = {
|
||||
|
|
|
|||
|
|
@ -329,10 +329,10 @@ static void release_inode_number(unsigned int inum)
|
|||
spin_unlock(&proc_inum_lock);
|
||||
}
|
||||
|
||||
static int proc_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd)
|
||||
{
|
||||
nd_set_link(nd, PDE(dentry->d_inode)->data);
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct inode_operations proc_link_inode_operations = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue