[LTP] [PATCH] syscalls/copy_file_range02.c: Compatible with new and old kernels
Jinhui huang
huangjh.jy@cn.fujitsu.com
Fri May 31 10:44:03 CEST 2019
On new kernels, copy_file_range() returned EISDIR when copyed contents
to directory, but on old kernels, it returned EBADF, we should accept
EBADF to be compatible with new and old kernels.
The patch as follows:
commit 11cbfb10775a ("vfs: deny copy_file_range() for non regular files")
Signed-off-by: Jinhui huang <huangjh.jy@cn.fujitsu.com>
---
.../syscalls/copy_file_range/copy_file_range02.c | 33 +++++++++++++++-------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
index 07c0207..9e6356c 100644
--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
@@ -54,19 +54,32 @@ static void verify_copy_file_range(unsigned int n)
TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd,
0, CONTSIZE, tc->flags));
- if (TST_RET == -1) {
- if (tc->exp_err == TST_ERR) {
+ if (TST_RET != -1) {
+ tst_res(TFAIL,
+ "copy_file_range returned wrong value: %ld", TST_RET);
+ return;
+ }
+
+ if (tc->exp_err == TST_ERR) {
+ tst_res(TPASS | TTERRNO,
+ "copy_file_range failed as expected");
+ } else {
+ /* copy_file_range() returned EISDIR when copyed contents to
+ * directory on new kernels, but on old kernels, it returned
+ * EBADF.
+ *
+ * the patch as follws:
+ * commit 11cbfb10775a ("vfs: deny copy_file_range() for non regular files")
+ */
+ if (tc->exp_err == EISDIR && TST_ERR == EBADF) {
tst_res(TPASS | TTERRNO,
- "copy_file_range failed as expected");
- } else {
- tst_res(TFAIL | TTERRNO,
- "copy_file_range failed unexpectedly; expected %s, but got",
- tst_strerrno(tc->exp_err));
+ "copy_file_range failed as expected");
return;
}
- } else {
- tst_res(TFAIL,
- "copy_file_range returned wrong value: %ld", TST_RET);
+
+ tst_res(TFAIL | TTERRNO,
+ "copy_file_range failed unexpectedly; expected %s, but got",
+ tst_strerrno(tc->exp_err));
}
}
--
1.8.3.1
More information about the ltp
mailing list