From cccbdd0d08660fbf099009c2f10b2a9089017cc0 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Thu, 14 Oct 2010 14:50:27 +0000 Subject: [PATCH] xfstests: randholes: encapsulate direct I/O setup code Pull the code used to get alignment information for direct I/O into a separate function. Signed-off-by: Alex Elder Acked-by: Dave Chinner --- src/randholes.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/randholes.c b/src/randholes.c index 45e23459..b4c3470a 100644 --- a/src/randholes.c +++ b/src/randholes.c @@ -270,6 +270,22 @@ readblks(int fd) return err; } +int +direct_setup(char *filename, int fd) +{ + if (xfscntl(filename, fd, DIOINFO, &diob) < 0) { + perror("xfscntl(FIOINFO)"); + return 1; + } + if (blocksize % diob.d_miniosz) { + fprintf(stderr, "blocksize %d must be a multiple of " + "%d for direct I/O\n", blocksize, diob.d_miniosz); + return 1; + } + + return 0; +} + int main(int argc, char *argv[]) { @@ -374,19 +390,9 @@ main(int argc, char *argv[]) } } - if (direct) { - if (xfscntl(filename, fd, DIOINFO, &diob) < 0) { - perror("xfscntl(FIOINFO)"); - return 1; - } - if (blocksize % diob.d_miniosz) { - fprintf(stderr, - "blocksize %d must be a multiple of %d for direct I/O\n", - blocksize, - diob.d_miniosz); - return 1; - } - } + if (direct && direct_setup(filename, fd)) + return 1; + printf(test?"write (skipped)\n":"write\n"); writeblks(filename, fd); printf("readback\n"); -- 2.39.5