[LTP] [PATCH] fcntl/fcntl16: close fd before unlink

[LTP] [PATCH] fcntl/fcntl16: close fd before unlink

[Stanislav Kholmanskikh]

This testcase fails on NFS but doesn't remove its
working directory on exit (NFS silly rename):

TWARN  :  tst_rmdir: rmobj(/mnt/fcn1GHJ8g) failed: unlink(/mnt/fcn1GHJ8g/.nfs0000000000000c4200000001) failed; errno=16: Device or resource busy

Fixed.

Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
---
 testcases/kernel/syscalls/fcntl/fcntl16.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/testcases/kernel/syscalls/fcntl/fcntl16.c b/testcases/kernel/syscalls/fcntl/fcntl16.c
index 8bdb6b5..12696a8 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl16.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl16.c
@@ -476,6 +476,7 @@ int run_test(int file_flag, int file_mode, int start, int end)
 			tst_resm(TFAIL, "First parent lock failed");
 			tst_resm(TFAIL, "Test case %d, errno = %d", test + 1,
 				 errno);
+			close(fd);
 			unlink(tmpname);
 			return 1;
 		}
@@ -489,6 +490,7 @@ int run_test(int file_flag, int file_mode, int start, int end)
 				tst_resm(TFAIL, "Second parent lock failed");
 				tst_resm(TFAIL, "Test case %d, errno = %d",
 					 test + 1, errno);
+				close(fd);
 				unlink(tmpname);
 				return 1;
 			}
@@ -559,6 +561,7 @@ int run_test(int file_flag, int file_mode, int start, int end)
 			tst_resm(TFAIL, "Third parent lock failed");
 			tst_resm(TFAIL, "Test case %d, errno = %d",
 				 test + 1, errno);
+			close(fd);
 			unlink(tmpname);
 			return 1;
 		}
@@ -572,6 +575,7 @@ int run_test(int file_flag, int file_mode, int start, int end)
 				tst_resm(TINFO, "Fourth parent lock failed");
 				tst_resm(TINFO, "Test case %d, errno = %d",
 					 test + 1, errno);
+				close(fd);
 				unlink(tmpname);
 				return 1;
 			}
-- 
1.7.1


------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] fcntl/fcntl16: close fd before unlink

[Wanlong Gao]

On 10/31/2013 04:41 PM, Stanislav Kholmanskikh wrote:
> This testcase fails on NFS but doesn't remove its
> working directory on exit (NFS silly rename):
> 
> TWARN  :  tst_rmdir: rmobj(/mnt/fcn1GHJ8g) failed: unlink(/mnt/fcn1GHJ8g/.nfs0000000000000c4200000001) failed; errno=16: Device or resource busy
> 
> Fixed.
> 
> Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
> ---
>  testcases/kernel/syscalls/fcntl/fcntl16.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)


Applied, thank you.

Wanlong Gao


------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list