diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /fs/proc/base.c | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
| download | blackbird-op-linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.gz blackbird-op-linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.zip | |
Merge from-linus to-akpm
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index ace151fa4878..491f2d9f89ac 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -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 = { |
