From: Konstantin Khlebnikov <k.khlebnikov@samsung.com>
To: xfs@oss.sgi.com
Subject: [PATCH] xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOLE/DATA
Date: Mon, 21 Apr 2014 20:43:05 +0400 [thread overview]
Message-ID: <20140421164305.22404.92195.stgit@buzz> (raw)
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@samsung.com>
---
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;
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2014-04-21 16:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 16:43 Konstantin Khlebnikov [this message]
2014-04-22 3:56 ` [PATCH] xfstests: generic/285: fix seek_sanity_test for generic SEEK_HOLE/DATA Jeff Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140421164305.22404.92195.stgit@buzz \
--to=k.khlebnikov@samsung.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).