aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-06-26 03:25:42 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:23 -0400
commitff9724a3f7a69f7b443c05981f84e28017c2fc5a (patch)
tree2c3fae763eb68d18645b4820e2189dc5d0ceabf5 /fs
parent5634708b5fce807bdf2091cfafc2fb24d791f0c8 (diff)
[PATCH] proc: Remove useless BKL in proc_pid_readlink
We already call everything except do_proc_readlink outside of the BKL in proc_pid_followlink, and there appears to be nothing in do_proc_readlink that needs any special protection. So remove this leftover from one of the BKL cleanup efforts. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/base.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 13e3ab99eb74..7169a713da1b 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1167,7 +1167,6 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
1167 struct dentry *de; 1167 struct dentry *de;
1168 struct vfsmount *mnt = NULL; 1168 struct vfsmount *mnt = NULL;
1169 1169
1170 lock_kernel();
1171 1170
1172 if (current->fsuid != inode->i_uid && !capable(CAP_DAC_OVERRIDE)) 1171 if (current->fsuid != inode->i_uid && !capable(CAP_DAC_OVERRIDE))
1173 goto out; 1172 goto out;
@@ -1183,7 +1182,6 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
1183 dput(de); 1182 dput(de);
1184 mntput(mnt); 1183 mntput(mnt);
1185out: 1184out:
1186 unlock_kernel();
1187 return error; 1185 return error;
1188} 1186}
1189 1187