summaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2012-03-19 17:04:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-20 22:16:50 +0100
commit701085b219016d38f105b031381b9cee6200253a (patch)
tree5111f137c507c8537d5d2c8e4203f0e6e4942bcb /fs/exec.c
parentexit_signal: fix the "parent has changed security domain" logic (diff)
downloadlinux-701085b219016d38f105b031381b9cee6200253a.tar.xz
linux-701085b219016d38f105b031381b9cee6200253a.zip
exec: move de_thread()->setmax_mm_hiwater_rss() into exec_mmap()
Minor cleanup. de_thread()->setmax_mm_hiwater_rss() looks a bit strange, move it into exec_mmap() which plays with old_mm. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--fs/exec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 1e94d2263ae0..95551c6da090 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -850,6 +850,7 @@ static int exec_mmap(struct mm_struct *mm)
if (old_mm) {
up_read(&old_mm->mmap_sem);
BUG_ON(active_mm != old_mm);
+ setmax_mm_hiwater_rss(&tsk->signal->maxrss, old_mm);
mm_update_next_owner(old_mm);
mmput(old_mm);
return 0;
@@ -980,9 +981,6 @@ no_thread_group:
/* we have changed execution domain */
tsk->exit_signal = SIGCHLD;
- if (current->mm)
- setmax_mm_hiwater_rss(&sig->maxrss, current->mm);
-
exit_itimers(sig);
flush_itimer_signals();