Skip to contentSkip to conversation

syscalls/copy_file_range02: use .needs_tmpdir and MAX_LEN

PATCH New Yang Xu 2 participants 2 messages Aug 23, 2019 – Aug 26, 2019

lore
Share & tools
lore

Yang Xu

author
#0 lore raw

PATCH v2 1/1 syscalls/copy_file_range02: use .needs_tmpdir and MAX_LEN

Since commit bc514b22, we have removed EXDEV test. all_filesystem ,mount_device and mntpoint make no sense. Remove it and use tmpdir.

As man-page said, when we plan to write at a position past the maximum allowed offset, it will return EFBIG. We should USE tst_max_lfs_filesize as dst instead of (tst_max_lfs_fileszie - MIN_OFF). Also, it doesn't affect EOVERFLOW.

---
 .../kernel/syscalls/copy_file_range/copy_file_range02.c     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +2 -4
index a08df9bdb..d6e843ee4 100644
@@ -115,7 +115,7 @@ static void verify_copy_file_range(unsigned int n)
 	}
 
 	if (tc->copy_to_fd == &fd_copy)
-		dst = tst_max_lfs_filesize() - MIN_OFF;
+		dst = tst_max_lfs_filesize();
 
 	TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd,
 				&dst, tc->len, tc->flags));
@@ -224,8 +224,6 @@ static struct tst_test test = {
 	.setup = setup,
 	.cleanup = cleanup,
 	.needs_root = 1,
-	.mount_device = 1,
-	.mntpoint = MNTPOINT,
-	.all_filesystems = 1,
+	.needs_tmpdir = 1,
 	.test_variants = TEST_VARIANTS,
 };
Signature · 1 line
2.18.1
#1 lore raw

PATCH v2 1/1 syscalls/copy_file_range02: use .needs_tmpdir and MAX_LEN

Hi all,

Quoted 10 lines

Since commit bc514b22, we have removed EXDEV test. all_filesystem ,mount_device and mntpoint make no sense. Remove it and use tmpdir.

As man-page said, when we plan to write at a position past the maximum allowed offset, it will return EFBIG. We should USE tst_max_lfs_filesize as dst instead of (tst_max_lfs_fileszie - MIN_OFF). Also, it doesn't affect EOVERFLOW.

Thanks for the fix. I tempted to split these 2 changes into 2 commits, but in the end kept it in single commit.

Merged (with adjusted commit message and
Reported-by for Murphy Zhou and Signed-off-by for Li as he did a review for previous version).

Kind regards,
Petr