xfs
[Top] [All Lists]

[PATCH] xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOL

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOLE/DATA
From: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx>
Date: Mon, 21 Apr 2014 20:43:05 +0400
Delivered-to: xfs@xxxxxxxxxxx
User-agent: StGit/0.17.1-dirty
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 <k.khlebnikov@xxxxxxxxxxx>
---
 src/seek_sanity_test.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c
index fbf5a8c..7cf45c0 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;

<Prev in Thread] Current Thread [Next in Thread>