aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Blunck <jblunck@suse.de>2008-02-14 19:34:29 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-14 21:13:32 -0800
commitdb74ece990ea59a9ec9f00f8881026059ef5caf5 (patch)
tree78de32a720defaeee1ab17d1de7b04a508fe0979
parent0d63e4f9ea61df1d727bd52a174aba732e6e1853 (diff)
downloadlinux-2.6.34-ux500-db74ece990ea59a9ec9f00f8881026059ef5caf5.tar.gz
Dont touch fs_struct in usermodehelper
This test seems to be unnecessary since we always have rootfs mounted before calling a usermodehelper. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Jan Blunck <jblunck@suse.de> Acked-by: Christoph Hellwig <hch@lst.de> Acked-by: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/kmod.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c
index bb7df2a28bd..22be3ff3f36 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -173,10 +173,7 @@ static int ____call_usermodehelper(void *data)
*/
set_user_nice(current, 0);
- retval = -EPERM;
- if (current->fs->root)
- retval = kernel_execve(sub_info->path,
- sub_info->argv, sub_info->envp);
+ retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
/* Exec failed? */
sub_info->retval = retval;