fsmount01: Avoid leaving file descriptor open
PATCH 1/1 fsmount01: Avoid leaving file descriptor open
Signed-off-by Petr Vorel <[email protected]>
---
Hi,
this is probably not needed, as fd will be closed at program exit anyway.
Kind regards,
Petr
testcases/kernel/syscalls/fsmount/fsmount01.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/fsmount/fsmount01.c +4 -1
@@ -16,6 +16,7 @@#define LINELENGTH 256#define MNTPOINT "newmount_point" +static int sfd, mfd, is_mounted;static int ismount (char *mntpoint)
@@ -38,6 +39,9 @@ static int ismount(char *mntpoint)static void cleanup (void ) { +if (sfd >0 ) +SAFE_CLOSE (sfd); +if (is_mounted)SAFE_UMOUNT (MNTPOINT ); }
@@ -67,7 +71,6 @@ static void test_fsmount(void)tst_brk (TBROK |TTERRNO ,"fsmount() failed to create a mount object" ); mfd =TST_RET ;tst_res (TPASS ,"fsmount() created a mount object" ); -SAFE_CLOSE (sfd);TEST (move_mount (mfd,"" ,AT_FDCWD ,MNTPOINT ,MOVE_MOUNT_F_EMPTY_PATH ));if (TST_RET <0 )
Signature · 1 line
2.25.0
PATCH 1/1 fsmount01: Avoid leaving file descriptor open
Quoted 36 lines · Petr Vorel
Signed-off-by Petr Vorel <[email protected]>---
Hi,this is probably not needed, as fd will be closed at program exit anyway.
Kind regards,
Petrtestcases/kernel/syscalls/fsmount/fsmount01.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)testcases/kernel/syscalls/fsmount/fsmount01.c +4
-0@@ -16,6 +16,7 @@#define LINELENGTH 256#define MNTPOINT "newmount_point" +static int sfd, mfd, is_mounted;static int ismount (char *mntpoint)@@ -38,6 +39,9 @@ static int ismount(char *mntpoint)static void cleanup (void ) { +if (sfd >0 ) +SAFE_CLOSE (sfd); +if (is_mounted)SAFE_UMOUNT (MNTPOINT ); }
testcases/kernel/syscalls/fsmount/fsmount01.c static void test_fsmount(void) · line 76
Quoted 7 lines
testcases/kernel/syscalls/fsmount/fsmount01.c +0
-1@@ -67,7 +71,6 @@ static void test_fsmount(void)tst_brk (TBROK |TTERRNO ,"fsmount() failed to create a mount object" ); mfd =TST_RET ;tst_res (TPASS ,"fsmount() created a mount object" ); -SAFE_CLOSE (sfd);TEST (move_mount (mfd,"" ,AT_FDCWD ,MNTPOINT ,MOVE_MOUNT_F_EMPTY_PATH ));if (TST_RET <0 )
My patchset is making enough changes to this file and fixes this issue as well. I won't ask you to not get this merged as you already sent it before me :)
My V2 will be on list very soon.
Signature · 1 line
viresh