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 <aelder@sgi.com>
Acked-by: Dave Chinner <david@fromorbit.com>

diff --git a/src/randholes.c b/src/randholes.c
index 45e234592169037d886abd612035780ba71bcdd4..b4c3470a2461ec4a3848332c79fbe7f0aaa6ccc3 100644 (file)
--- 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");