diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:34:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:13:32 -0500 |
commit | db74ece990ea59a9ec9f00f8881026059ef5caf5 (patch) | |
tree | 78de32a720defaeee1ab17d1de7b04a508fe0979 /kernel | |
parent | 0d63e4f9ea61df1d727bd52a174aba732e6e1853 (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/kmod.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index bb7df2a28bd7..22be3ff3f363 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -173,10 +173,7 @@ static int ____call_usermodehelper(void *data) | |||
173 | */ | 173 | */ |
174 | set_user_nice(current, 0); | 174 | set_user_nice(current, 0); |
175 | 175 | ||
176 | retval = -EPERM; | 176 | retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp); |
177 | if (current->fs->root) | ||
178 | retval = kernel_execve(sub_info->path, | ||
179 | sub_info->argv, sub_info->envp); | ||
180 | 177 | ||
181 | /* Exec failed? */ | 178 | /* Exec failed? */ |
182 | sub_info->retval = retval; | 179 | sub_info->retval = retval; |