From: Cyril H. <su...@li...> - 2012-09-18 07:56:57
|
The branch, master, has been updated via e8a93f821994fbf160eab533f152599e8561a77f (commit) from d3f22c05202c3ec296c43ca09907f5adc9600c02 (commit) - Log ----------------------------------------------------------------- commit e8a93f821994fbf160eab533f152599e8561a77f Author: DAN LI <li...@cn...> Date: Thu Sep 13 09:26:04 2012 +0800 bind/03, 21 rbind/38, 33:fix missing umount and error umount in these cases The cases have the same problem that dirs are still in mount when their targets are removed.for rbind/38,beside the problem above,there are two error umount operations that umount dirs that are not in mount. and all these result in making the test script trapped in a infinite loop. To resolve these problems,all we need is just umount the mountpoints before their targets are removed and delete the error umount operations. Signed-off-by: Dou Xin <wq...@cn...> Signed-off-by: DAN LI <li...@cn...> ----------------------------------------------------------------------- Summary of changes: testcases/kernel/fs/fs_bind/bind/test03 | 1 + testcases/kernel/fs/fs_bind/bind/test21 | 1 + testcases/kernel/fs/fs_bind/rbind/test33 | 1 + testcases/kernel/fs/fs_bind/rbind/test38 | 5 ++--- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/fs/fs_bind/bind/test03 b/testcases/kernel/fs/fs_bind/bind/test03 index 10b678a..5989a3a 100755 --- a/testcases/kernel/fs/fs_bind/bind/test03 +++ b/testcases/kernel/fs/fs_bind/bind/test03 @@ -98,6 +98,7 @@ trap '' ERR umount share2 umount share2 umount parent1 + umount parent2 rm -rf parent* share* cleanup diff --git a/testcases/kernel/fs/fs_bind/bind/test21 b/testcases/kernel/fs/fs_bind/bind/test21 index 741161f..ab0bf88 100755 --- a/testcases/kernel/fs/fs_bind/bind/test21 +++ b/testcases/kernel/fs/fs_bind/bind/test21 @@ -93,6 +93,7 @@ trap '' ERR umount dir1 umount dir2 umount dir3 + umount dir4 rm -rf dir* diff --git a/testcases/kernel/fs/fs_bind/rbind/test33 b/testcases/kernel/fs/fs_bind/rbind/test33 index 8247747..9ccc53b 100755 --- a/testcases/kernel/fs/fs_bind/rbind/test33 +++ b/testcases/kernel/fs/fs_bind/rbind/test33 @@ -93,6 +93,7 @@ trap '' ERR umount dir1 umount dir2 umount dir3 + umount dir4 rm -rf dir* diff --git a/testcases/kernel/fs/fs_bind/rbind/test38 b/testcases/kernel/fs/fs_bind/rbind/test38 index c06f072..c3f46fb 100755 --- a/testcases/kernel/fs/fs_bind/rbind/test38 +++ b/testcases/kernel/fs/fs_bind/rbind/test38 @@ -82,11 +82,10 @@ trap '' ERR umount parent1/child1 umount parent2/child1 umount parent2/child1 - umount parent2 + umount parent2/child2 + umount parent2 umount share1 umount share1 - umount share2 - umount share2 rm -rf parent* share* cleanup hooks/post-receive -- ltp |