diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-05-10 20:44:54 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:20 -0400 |
commit | 7f2da1e7d0330395e5e9e350b879b98a1ea495df (patch) | |
tree | adc01ced45bb1de10fe58511e7143bbbd138a192 /kernel | |
parent | 8bb79224b87aab92071e94d46e70bd160d89bf34 (diff) |
[PATCH] kill altroot
long overdue...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exec_domain.c | 1 | ||||
-rw-r--r-- | kernel/exit.c | 2 | ||||
-rw-r--r-- | kernel/fork.c | 7 |
3 files changed, 0 insertions, 10 deletions
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index c1ef192aa655..0d407e886735 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c | |||
@@ -168,7 +168,6 @@ __set_personality(u_long personality) | |||
168 | current->personality = personality; | 168 | current->personality = personality; |
169 | oep = current_thread_info()->exec_domain; | 169 | oep = current_thread_info()->exec_domain; |
170 | current_thread_info()->exec_domain = ep; | 170 | current_thread_info()->exec_domain = ep; |
171 | set_fs_altroot(); | ||
172 | 171 | ||
173 | module_put(oep->module); | 172 | module_put(oep->module); |
174 | return 0; | 173 | return 0; |
diff --git a/kernel/exit.c b/kernel/exit.c index 6cdf60712bd2..0caf590548a0 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -565,8 +565,6 @@ void put_fs_struct(struct fs_struct *fs) | |||
565 | if (atomic_dec_and_test(&fs->count)) { | 565 | if (atomic_dec_and_test(&fs->count)) { |
566 | path_put(&fs->root); | 566 | path_put(&fs->root); |
567 | path_put(&fs->pwd); | 567 | path_put(&fs->pwd); |
568 | if (fs->altroot.dentry) | ||
569 | path_put(&fs->altroot); | ||
570 | kmem_cache_free(fs_cachep, fs); | 568 | kmem_cache_free(fs_cachep, fs); |
571 | } | 569 | } |
572 | } | 570 | } |
diff --git a/kernel/fork.c b/kernel/fork.c index abb3ed6298f6..5e050c1317c4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -657,13 +657,6 @@ static struct fs_struct *__copy_fs_struct(struct fs_struct *old) | |||
657 | path_get(&old->root); | 657 | path_get(&old->root); |
658 | fs->pwd = old->pwd; | 658 | fs->pwd = old->pwd; |
659 | path_get(&old->pwd); | 659 | path_get(&old->pwd); |
660 | if (old->altroot.dentry) { | ||
661 | fs->altroot = old->altroot; | ||
662 | path_get(&old->altroot); | ||
663 | } else { | ||
664 | fs->altroot.mnt = NULL; | ||
665 | fs->altroot.dentry = NULL; | ||
666 | } | ||
667 | read_unlock(&old->lock); | 660 | read_unlock(&old->lock); |
668 | } | 661 | } |
669 | return fs; | 662 | return fs; |