xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOLE/DATA
PATCH 1/1 xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOLE/DATA
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.
--- src/seek_sanity_test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
src/seek_sanity_test.c +3 -2
@@ -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;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 8 lines · Konstantin Khlebnikov
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.
Am not verified against NFS, but the fix look good to me.
Thanks,
-Jeff
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs