quotactl06: Fix tmpdir cleanup if setup() exits early
PATCH v2 1/1 quotactl06: Fix tmpdir cleanup if setup() exits early
When setup() exits with TCONF before USRPATH or TESTDIR1 get created, cleanup() will trigger TWARN when it tries to delete them. Check whether the file and directory exists before removing them.
---
Changes since v1:
- Also check whether USRPATH exists before deleting it
testcases/kernel/syscalls/quotactl/quotactl06.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/quotactl/quotactl06.c +5 -2
@@ -206,8 +206,11 @@ static void setup(void)static void cleanup (void ) { -SAFE_UNLINK (USRPATH ); -SAFE_RMDIR (TESTDIR1 ); +if (!access (USRPATH ,F_OK )) +SAFE_UNLINK (USRPATH ); + +if (!access (TESTDIR1 ,F_OK )) +SAFE_RMDIR (TESTDIR1 ); }static struct tst_test test = {
Signature · 5 lines
2.35.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Martin
Looks good to me,
Best Regards
Yang Xu
Quoted 31 lines
When
setup()exits with TCONF before USRPATH or TESTDIR1 get created,cleanup()will trigger TWARN when it tries to delete them. Check whether the file and directory exists before removing them.Signed-off-by Martin Doucha<[email protected]>---
Changes since v1:
- Also check whether USRPATH exists before deleting ittestcases/kernel/syscalls/quotactl/quotactl06.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)testcases/kernel/syscalls/quotactl/quotactl06.c +5
-2@@ -206,8 +206,11 @@ static void setup(void)static void cleanup (void ) { -SAFE_UNLINK (USRPATH ); -SAFE_RMDIR (TESTDIR1 ); +if (!access (USRPATH ,F_OK )) +SAFE_UNLINK (USRPATH ); + +if (!access (TESTDIR1 ,F_OK )) +SAFE_RMDIR (TESTDIR1 ); }static struct tst_test test = {
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Martin
Merged this patchset, thanks.
Best Regards
Yang Xu
Quoted 39 lines
Hi Martin
Looks good to me,
Reviewed-by Yang Xu<[email protected]>Best Regards
Yang XuQuoted 31 lines
When
setup()exits with TCONF before USRPATH or TESTDIR1 get created,cleanup()will trigger TWARN when it tries to delete them. Check whether the file and directory exists before removing them.Signed-off-by Martin Doucha<[email protected]>---
Changes since v1:
- Also check whether USRPATH exists before deleting ittestcases/kernel/syscalls/quotactl/quotactl06.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)testcases/kernel/syscalls/quotactl/quotactl06.c +5
-2@@ -206,8 +206,11 @@ static void setup(void)static void cleanup (void ) { -SAFE_UNLINK (USRPATH ); -SAFE_RMDIR (TESTDIR1 ); +if (!access (USRPATH ,F_OK )) +SAFE_UNLINK (USRPATH ); + +if (!access (TESTDIR1 ,F_OK )) +SAFE_RMDIR (TESTDIR1 ); }static struct tst_test test = {
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp