Import of Linux/MIPS 1.3.0

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/proc/link.c b/fs/proc/link.c
index 769014f46..2f940a275 100644
--- a/fs/proc/link.c
+++ b/fs/proc/link.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 
@@ -103,16 +104,16 @@ static int proc_follow_link(struct inode * dir, struct inode * inode,
 	unsigned int pid, ino;
 	struct task_struct * p;
 	struct inode * new_inode;
-	int i;
+	int i, error;
 
 	*res_inode = NULL;
 	if (dir)
 		iput(dir);
 	if (!inode)
 		return -ENOENT;
-	if (!permission(inode, MAY_EXEC)) {
+	if ((error = permission(inode, MAY_EXEC)) != 0){
 		iput(inode);
-		return -EACCES;
+		return error;
 	}
 	ino = inode->i_ino;
 	pid = ino >> 16;