From: Konstantin Khlebnikov Date: Tue, 22 Apr 2014 00:47:23 +0000 (+1000) Subject: generic/285: fix test for generic SEEK_HOLE/DATA implementations X-Git-Tag: v2022.05.01~3161 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=35ee39228be394c66ec8c7d7702526861511ae9a;p=xfstests-dev.git generic/285: fix test for generic SEEK_HOLE/DATA implementations Generic implementation of SEEK_HOLE/DATA reports whole file as data chunk with virtual hole at the end (generic_file_llseek, used by ext2/ext3/reiserfs/nfs). Currently test prepares file smaller than expected for "huge file" testcases (testcases 10-12). This patch fixes test file layout, now second data chunk ends right at the expected end of file. Plus it fixes type of 'filesz' argument, it should be off_t. Signed-off-by: Konstantin Khlebnikov Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c index fbf5a8c5..7cf45c0d 100644 --- a/src/seek_sanity_test.c +++ b/src/seek_sanity_test.c @@ -157,7 +157,7 @@ static int do_create(const char *filename) return fd; } -static int do_lseek(int testnum, int subtest, int fd, int filsz, int origin, +static int do_lseek(int testnum, int subtest, int fd, off_t filsz, int origin, off_t set, off_t exp) { off_t pos, exp2; @@ -203,7 +203,7 @@ static int huge_file_test(int fd, int testnum, off_t filsz) { char *buf = NULL; int bufsz = alloc_size * 16; /* XFS seems to round allocated size */ - off_t off = filsz - 2*bufsz; + off_t off = filsz - bufsz; int ret = -1; buf = do_malloc(bufsz); @@ -211,6 +211,7 @@ static int huge_file_test(int fd, int testnum, off_t filsz) goto out; memset(buf, 'a', bufsz); + /* |- DATA -|- HUGE HOLE -|- DATA -| */ ret = do_pwrite(fd, buf, bufsz, 0); if (ret) goto out;