Land part 2 of clang-format changes

Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4
Signed-off-by: Nigel Babu <nigelb@redhat.com>

5 files changed, 721 insertions, 720 deletions

diff --git a/tests/bugs/gfapi/bug-1093594.c b/tests/bugs/gfapi/bug-1093594.c
index aff271e4caf..f7a06dd5ba8 100644
--- a/tests/bugs/gfapi/bug-1093594.c
+++ b/tests/bugs/gfapi/bug-1093594.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define WRITE_SIZE (128*1024)
+#define WRITE_SIZE (128 * 1024)
 #define READ_WRITE_LOOP 100
 #define FOP_LOOP_COUNT 20
 #define TEST_CASE_LOOP 20
@@ -14,304 +14,298 @@ int gfapi = 1;
 static int extension = 1;
 
 static int
-large_number_of_fops (glfs_t *fs) {
-        int       ret       = 0;
-        int       i         = 0;
-        glfs_fd_t *fd       = NULL;
-        glfs_fd_t *fd1      = NULL;
-        char      *dir1     = NULL, *dir2 = NULL, *filename1 = NULL, *filename2 = NULL;
-        char      *buf      = NULL;
-        struct stat sb      = {0, };
-
-        for (i = 0 ; i < FOP_LOOP_COUNT ; i++) {
-                ret = asprintf (&dir1, "dir%d", extension);
-                if (ret < 0) {
-                        fprintf (stderr, "cannot construct filename (%s)",
-                                 strerror (errno));
-                        return ret;
-                }
-
-                extension++;
-
-                ret = glfs_mkdir (fs, dir1, 0755);
-                if (ret < 0) {
-                        fprintf (stderr, "mkdir(%s): %s\n", dir1, strerror (errno));
-                        return -1;
-                }
-
-                fd = glfs_opendir (fs, dir1);
-                if (!fd) {
-                        fprintf (stderr, "/: %s\n", strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_fsetxattr (fd, "user.dirfattr", "fsetxattr", 8, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "fsetxattr(%s): %d (%s)\n", dir1, ret,
-                                strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_closedir (fd);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_closedir failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_rmdir (fs, dir1);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_unlink failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = asprintf (&filename1, "file%d", extension);
-                if (ret < 0) {
-                        fprintf (stderr, "cannot construct filename (%s)",
-                                strerror (errno));
-                        return ret;
-                }
-
-                ret = asprintf (&filename2, "file-%d", extension);
-                if (ret < 0) {
-                        fprintf (stderr, "cannot construct filename (%s)",
-                                strerror (errno));
-                        return ret;
-                }
-
-                extension++;
-
-                fd = glfs_creat (fs, filename1, O_RDWR, 0644);
-                if (!fd) {
-                        fprintf (stderr, "%s: (%p) %s\n", filename1, fd,
-                                strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_rename (fs, filename1, filename2);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_rename failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_lstat (fs, filename2, &sb);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_lstat failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_close (fd);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_close failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_unlink (fs, filename2);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_unlink failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
+large_number_of_fops(glfs_t *fs)
+{
+    int ret = 0;
+    int i = 0;
+    glfs_fd_t *fd = NULL;
+    glfs_fd_t *fd1 = NULL;
+    char *dir1 = NULL, *dir2 = NULL, *filename1 = NULL, *filename2 = NULL;
+    char *buf = NULL;
+    struct stat sb = {
+        0,
+    };
+
+    for (i = 0; i < FOP_LOOP_COUNT; i++) {
+        ret = asprintf(&dir1, "dir%d", extension);
+        if (ret < 0) {
+            fprintf(stderr, "cannot construct filename (%s)", strerror(errno));
+            return ret;
         }
-}
 
-static int
-large_read_write (glfs_t *fs) {
+        extension++;
 
-        int       ret       = 0;
-        int       j         = 0;
-        glfs_fd_t *fd       = NULL;
-        glfs_fd_t *fd1      = NULL;
-        char      *filename = NULL;
-        char      *buf      = NULL;
+        ret = glfs_mkdir(fs, dir1, 0755);
+        if (ret < 0) {
+            fprintf(stderr, "mkdir(%s): %s\n", dir1, strerror(errno));
+            return -1;
+        }
 
-        ret = asprintf (&filename, "filerw%d", extension);
+        fd = glfs_opendir(fs, dir1);
+        if (!fd) {
+            fprintf(stderr, "/: %s\n", strerror(errno));
+            return -1;
+        }
+
+        ret = glfs_fsetxattr(fd, "user.dirfattr", "fsetxattr", 8, 0);
         if (ret < 0) {
-                fprintf (stderr, "cannot construct filename (%s)",
-                         strerror (errno));
-                return ret;
+            fprintf(stderr, "fsetxattr(%s): %d (%s)\n", dir1, ret,
+                    strerror(errno));
+            return -1;
         }
 
-        extension++;
+        ret = glfs_closedir(fd);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_closedir failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
+        }
 
-        fd = glfs_creat (fs, filename, O_RDWR, 0644);
-        if (!fd) {
-                fprintf (stderr, "%s: (%p) %s\n", filename, fd,
-                        strerror (errno));
-                return -1;
+        ret = glfs_rmdir(fs, dir1);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_unlink failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
         }
 
-        buf = (char *) malloc (WRITE_SIZE);
-        memset (buf, '-', WRITE_SIZE);
+        ret = asprintf(&filename1, "file%d", extension);
+        if (ret < 0) {
+            fprintf(stderr, "cannot construct filename (%s)", strerror(errno));
+            return ret;
+        }
 
-        for (j = 0; j < READ_WRITE_LOOP; j++) {
-                ret = glfs_write (fd, buf, WRITE_SIZE, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "Write(%s): %d (%s)\n", filename, ret,
-                                strerror (errno));
-                        return ret;
-                }
+        ret = asprintf(&filename2, "file-%d", extension);
+        if (ret < 0) {
+            fprintf(stderr, "cannot construct filename (%s)", strerror(errno));
+            return ret;
         }
 
-        fd1 = glfs_open (fs, filename, O_RDWR);
-        if (fd1 < 0) {
-                fprintf (stderr, "Open(%s): %d (%s)\n", filename, ret,
-                        strerror (errno));
-                return -1;
+        extension++;
+
+        fd = glfs_creat(fs, filename1, O_RDWR, 0644);
+        if (!fd) {
+            fprintf(stderr, "%s: (%p) %s\n", filename1, fd, strerror(errno));
+            return -1;
         }
 
-        glfs_lseek (fd1, 0, SEEK_SET);
-        for (j = 0; j < READ_WRITE_LOOP; j++) {
-                ret = glfs_read (fd1, buf, WRITE_SIZE, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "Read(%s): %d (%s)\n", filename, ret,
-                                strerror (errno));
-                        return ret;
-                }
+        ret = glfs_rename(fs, filename1, filename2);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_rename failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
         }
 
-        for (j = 0; j < READ_WRITE_LOOP; j++) {
-                ret = glfs_write (fd1, buf, WRITE_SIZE, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "Write(%s): %d (%s)\n", filename, ret,
-                                strerror (errno));
-                        return ret;
-                }
+        ret = glfs_lstat(fs, filename2, &sb);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_lstat failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
         }
 
-        glfs_close (fd);
-        glfs_close (fd1);
-        ret = glfs_unlink (fs, filename);
+        ret = glfs_close(fd);
         if (ret < 0) {
-                fprintf (stderr, "glfs_unlink failed with ret: %d (%s)\n",
-                        ret, strerror (errno));
-                return -1;
+            fprintf(stderr, "glfs_close failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
         }
 
-        free (buf);
-        free (filename);
+        ret = glfs_unlink(fs, filename2);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_unlink failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
+        }
+    }
 }
 
 static int
-volfile_change (const char *volname) {
-        int   ret = 0;
-        char *cmd = NULL, *cmd1 = NULL;
+large_read_write(glfs_t *fs)
+{
+    int ret = 0;
+    int j = 0;
+    glfs_fd_t *fd = NULL;
+    glfs_fd_t *fd1 = NULL;
+    char *filename = NULL;
+    char *buf = NULL;
+
+    ret = asprintf(&filename, "filerw%d", extension);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct filename (%s)", strerror(errno));
+        return ret;
+    }
 
-        ret = asprintf (&cmd, "gluster volume set %s stat-prefetch off",
-                        volname);
-        if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                return ret;
-        }
+    extension++;
 
-        ret = asprintf (&cmd1, "gluster volume set %s stat-prefetch on",
-                        volname);
+    fd = glfs_creat(fs, filename, O_RDWR, 0644);
+    if (!fd) {
+        fprintf(stderr, "%s: (%p) %s\n", filename, fd, strerror(errno));
+        return -1;
+    }
+
+    buf = (char *)malloc(WRITE_SIZE);
+    memset(buf, '-', WRITE_SIZE);
+
+    for (j = 0; j < READ_WRITE_LOOP; j++) {
+        ret = glfs_write(fd, buf, WRITE_SIZE, 0);
         if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                return ret;
+            fprintf(stderr, "Write(%s): %d (%s)\n", filename, ret,
+                    strerror(errno));
+            return ret;
         }
+    }
 
-        ret = system (cmd);
+    fd1 = glfs_open(fs, filename, O_RDWR);
+    if (fd1 < 0) {
+        fprintf(stderr, "Open(%s): %d (%s)\n", filename, ret, strerror(errno));
+        return -1;
+    }
+
+    glfs_lseek(fd1, 0, SEEK_SET);
+    for (j = 0; j < READ_WRITE_LOOP; j++) {
+        ret = glfs_read(fd1, buf, WRITE_SIZE, 0);
         if (ret < 0) {
-                fprintf (stderr, "stat-prefetch off on (%s) failed", volname);
-                return ret;
+            fprintf(stderr, "Read(%s): %d (%s)\n", filename, ret,
+                    strerror(errno));
+            return ret;
         }
+    }
 
-        ret = system (cmd1);
+    for (j = 0; j < READ_WRITE_LOOP; j++) {
+        ret = glfs_write(fd1, buf, WRITE_SIZE, 0);
         if (ret < 0) {
-                fprintf (stderr, "stat-prefetch on on (%s) failed", volname);
-                return ret;
+            fprintf(stderr, "Write(%s): %d (%s)\n", filename, ret,
+                    strerror(errno));
+            return ret;
         }
+    }
+
+    glfs_close(fd);
+    glfs_close(fd1);
+    ret = glfs_unlink(fs, filename);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_unlink failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        return -1;
+    }
+
+    free(buf);
+    free(filename);
+}
 
-        free (cmd);
-        free (cmd1);
+static int
+volfile_change(const char *volname)
+{
+    int ret = 0;
+    char *cmd = NULL, *cmd1 = NULL;
+
+    ret = asprintf(&cmd, "gluster volume set %s stat-prefetch off", volname);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct cli command string (%s)",
+                strerror(errno));
         return ret;
+    }
+
+    ret = asprintf(&cmd1, "gluster volume set %s stat-prefetch on", volname);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct cli command string (%s)",
+                strerror(errno));
+        return ret;
+    }
+
+    ret = system(cmd);
+    if (ret < 0) {
+        fprintf(stderr, "stat-prefetch off on (%s) failed", volname);
+        return ret;
+    }
+
+    ret = system(cmd1);
+    if (ret < 0) {
+        fprintf(stderr, "stat-prefetch on on (%s) failed", volname);
+        return ret;
+    }
+
+    free(cmd);
+    free(cmd1);
+    return ret;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        glfs_t    *fs       = NULL;
-        int       ret       = 0;
-        int       i         = 0;
-        glfs_fd_t *fd       = NULL;
-        glfs_fd_t *fd1      = NULL;
-        char      *topdir   = "topdir", *filename = "file1";
-        char      *buf      = NULL;
-        char      *logfile  = NULL;
-        char      *hostname = NULL;
-
-        if (argc != 4) {
-                fprintf (stderr,
-                        "Expect following args %s <hostname> <Vol> <log file>\n"
-                        , argv[0]);
-                return -1;
+    glfs_t *fs = NULL;
+    int ret = 0;
+    int i = 0;
+    glfs_fd_t *fd = NULL;
+    glfs_fd_t *fd1 = NULL;
+    char *topdir = "topdir", *filename = "file1";
+    char *buf = NULL;
+    char *logfile = NULL;
+    char *hostname = NULL;
+
+    if (argc != 4) {
+        fprintf(stderr,
+                "Expect following args %s <hostname> <Vol> <log file>\n",
+                argv[0]);
+        return -1;
+    }
+
+    hostname = argv[1];
+    logfile = argv[3];
+
+    for (i = 0; i < TEST_CASE_LOOP; i++) {
+        fs = glfs_new(argv[2]);
+        if (!fs) {
+            fprintf(stderr, "glfs_new: returned NULL (%s)\n", strerror(errno));
+            return -1;
         }
 
-        hostname = argv[1];
-        logfile = argv[3];
-
-        for (i = 0; i < TEST_CASE_LOOP; i++) {
-                fs = glfs_new (argv[2]);
-                if (!fs) {
-                        fprintf (stderr, "glfs_new: returned NULL (%s)\n",
-                                strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_set_volfile_server failed ret:%d (%s)\n",
-                        ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_set_logging (fs, logfile, 7);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_set_logging failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = glfs_init (fs);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_init failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
-
-                ret = large_number_of_fops (fs);
-                if (ret < 0)
-                        return -1;
-
-                ret = large_read_write (fs);
-                if (ret < 0)
-                        return -1;
-
-                ret = volfile_change (argv[2]);
-                if (ret < 0)
-                        return -1;
-
-                ret = large_number_of_fops (fs);
-                if (ret < 0)
-                        return -1;
-
-                ret = large_read_write (fs);
-                if (ret < 0)
-                        return -1;
-
-                ret = glfs_fini (fs);
-                if (ret < 0) {
-                        fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                                ret, strerror (errno));
-                        return -1;
-                }
+        ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_set_volfile_server failed ret:%d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
+        }
+
+        ret = glfs_set_logging(fs, logfile, 7);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_set_logging failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
+        }
+
+        ret = glfs_init(fs);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_init failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
+        }
+
+        ret = large_number_of_fops(fs);
+        if (ret < 0)
+            return -1;
+
+        ret = large_read_write(fs);
+        if (ret < 0)
+            return -1;
+
+        ret = volfile_change(argv[2]);
+        if (ret < 0)
+            return -1;
+
+        ret = large_number_of_fops(fs);
+        if (ret < 0)
+            return -1;
+
+        ret = large_read_write(fs);
+        if (ret < 0)
+            return -1;
+
+        ret = glfs_fini(fs);
+        if (ret < 0) {
+            fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                    strerror(errno));
+            return -1;
         }
-        return 0;
+    }
+    return 0;
 }
diff --git a/tests/bugs/gfapi/bug-1319374.c b/tests/bugs/gfapi/bug-1319374.c
index bf2da998d6e..bd80462e3ba 100644
--- a/tests/bugs/gfapi/bug-1319374.c
+++ b/tests/bugs/gfapi/bug-1319374.c
@@ -9,122 +9,122 @@
 glfs_t *
 setup_new_client(char *hostname, char *volname, char *log_file, int flag)
 {
-        int ret = 0;
-        glfs_t *fs = NULL;
-
-        fs = glfs_new (volname);
-        if (!fs) {
-                fprintf (stderr, "\nglfs_new: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_logging (fs, log_file, 7);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_logging failed with ret: %d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        if (flag == NO_INIT)
-                goto out;
-
-        ret = glfs_init (fs);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_init failed with ret: %d (%s)\n",
-                                  ret, strerror (errno));
-                goto error;
-        }
+    int ret = 0;
+    glfs_t *fs = NULL;
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "\nglfs_new: returned NULL (%s)\n", strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_logging(fs, log_file, 7);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_logging failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    if (flag == NO_INIT)
+        goto out;
+
+    ret = glfs_init(fs);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_init failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
 
 out:
-        return fs;
+    return fs;
 error:
-        return NULL;
+    return NULL;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int        ret         = 0;
-        glfs_t    *fs1         = NULL;
-        glfs_t    *fs2         = NULL;
-        glfs_t    *fs3         = NULL;
-        char      *volname     = NULL;
-        char      *log_file    = NULL;
-        char      *hostname    = NULL;
-
-        if (argc != 4) {
-                fprintf (stderr,
-                                "Expect following args %s <hostname> <Vol> <log file location>\n"
-                                , argv[0]);
-                return -1;
-        }
-
-        hostname = argv[1];
-        volname = argv[2];
-        log_file = argv[3];
-
-        fs1 = setup_new_client (hostname, volname, log_file, NO_INIT);
-        if (!fs1) {
-                fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        fs2 = setup_new_client (hostname, volname, log_file, 0);
-        if (!fs2) {
-                fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        fs3 = setup_new_client (hostname, volname, log_file, 0);
-        if (!fs3) {
-                fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_fini (fs3);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                         ret, strerror (errno));
-                goto error;
-        }
-
-        /* The crash is seen in gf_log_flush_timeout_cbk(), and this gets
-         * triggered when 30s timer expires, hence the sleep of 31s
-         */
-        sleep (31);
-        ret = glfs_fini (fs2);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                         ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_init (fs1);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_init failed with ret: %d (%s)\n",
-                                  ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_fini (fs1);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                         ret, strerror (errno));
-                goto error;
-        }
-
-        return 0;
-error:
+    int ret = 0;
+    glfs_t *fs1 = NULL;
+    glfs_t *fs2 = NULL;
+    glfs_t *fs3 = NULL;
+    char *volname = NULL;
+    char *log_file = NULL;
+    char *hostname = NULL;
+
+    if (argc != 4) {
+        fprintf(
+            stderr,
+            "Expect following args %s <hostname> <Vol> <log file location>\n",
+            argv[0]);
         return -1;
+    }
+
+    hostname = argv[1];
+    volname = argv[2];
+    log_file = argv[3];
+
+    fs1 = setup_new_client(hostname, volname, log_file, NO_INIT);
+    if (!fs1) {
+        fprintf(stderr, "\nsetup_new_client: returned NULL (%s)\n",
+                strerror(errno));
+        goto error;
+    }
+
+    fs2 = setup_new_client(hostname, volname, log_file, 0);
+    if (!fs2) {
+        fprintf(stderr, "\nsetup_new_client: returned NULL (%s)\n",
+                strerror(errno));
+        goto error;
+    }
+
+    fs3 = setup_new_client(hostname, volname, log_file, 0);
+    if (!fs3) {
+        fprintf(stderr, "\nsetup_new_client: returned NULL (%s)\n",
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_fini(fs3);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    /* The crash is seen in gf_log_flush_timeout_cbk(), and this gets
+     * triggered when 30s timer expires, hence the sleep of 31s
+     */
+    sleep(31);
+    ret = glfs_fini(fs2);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_init(fs1);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_init failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_fini(fs1);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    return 0;
+error:
+    return -1;
 }
diff --git a/tests/bugs/gfapi/bug-1447266/1460514.c b/tests/bugs/gfapi/bug-1447266/1460514.c
index f04d2d1463f..c721559a668 100644
--- a/tests/bugs/gfapi/bug-1447266/1460514.c
+++ b/tests/bugs/gfapi/bug-1447266/1460514.c
@@ -9,135 +9,142 @@
 #include <glusterfs/api/glfs.h>
 #include <glusterfs/api/glfs-handles.h>
 
-#define LOG_ERR(func, ret) do { \
-        if (ret != 0) {            \
-                fprintf (stderr, "%s : returned error %d (%s)\n", \
-                         func, ret, strerror (errno)); \
-                goto out; \
-        } else { \
-                fprintf (stderr, "%s : returned %d\n", func, ret); \
-        } \
-        } while (0)
+#define LOG_ERR(func, ret)                                                     \
+    do {                                                                       \
+        if (ret != 0) {                                                        \
+            fprintf(stderr, "%s : returned error %d (%s)\n", func, ret,        \
+                    strerror(errno));                                          \
+            goto out;                                                          \
+        } else {                                                               \
+            fprintf(stderr, "%s : returned %d\n", func, ret);                  \
+        }                                                                      \
+    } while (0)
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int                     ret            = 0;
-        glfs_t                  *fs            = NULL;
-        struct glfs_object      *root = NULL, *dir = NULL, *subdir = NULL;
-        struct stat             sb             = {0, };
-        char                    *dirname       = "dir";
-        char                    *subdirname    = "subdir";
-        char                    *logfile       = NULL;
-        char                    *volname       = NULL;
-        char                    *hostname      = NULL;
-        unsigned char subdir_handle[GFAPI_HANDLE_LENGTH] = {'\0'};
-
-        if (argc != 4) {
-                fprintf (stderr, "Invalid argument\n");
-                exit(1);
-        }
-
-        hostname = argv[1];
-        volname = argv[2];
-        logfile = argv[3];
-
-        fs = glfs_new (volname);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                ret = -1;
-                goto out;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        LOG_ERR("glfs_set_volfile_server", ret);
-
-        ret = glfs_set_logging (fs, logfile, 7);
-        LOG_ERR("glfs_set_logging", ret);
-
-        ret = glfs_init (fs);
-        LOG_ERR("first attempt glfs_init", ret);
-
-        root = glfs_h_lookupat (fs, NULL, "/", &sb, 0);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of / ,%s\n",
-                         strerror (errno));
-                goto out;
-        }
-        dir = glfs_h_mkdir (fs, root, dirname, 0644, &sb);
-        if (dir == NULL) {
-                 fprintf (stderr, "glfs_h_mkdir: error on directory creation dir ,%s\n",
-                         strerror (errno));
-                goto out;
-        }
-        subdir = glfs_h_mkdir (fs, root, subdirname, 0644, &sb);
-        if (subdir == NULL) {
-                 fprintf (stderr, "glfs_h_mkdir: error on directory creation subdir ,%s\n",
-                         strerror (errno));
-                goto out;
-        }
-        ret = glfs_h_extract_handle (subdir, subdir_handle,
-                                             GFAPI_HANDLE_LENGTH);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_h_extract_handle: error extracting handle of %s: %s\n",
-                         subdirname, strerror (errno));
-                goto out;
-        }
-
-        glfs_h_close (subdir);
-        subdir = NULL;
-        glfs_h_close (dir);
-        dir = NULL;
-
-        if (fs) {
-                ret = glfs_fini(fs);
-                fprintf (stderr, "glfs_fini(fs) returned %d \n", ret);
-        }
-
-        fs = NULL;
-
-        fs = glfs_new (volname);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                ret = -1;
-                goto out;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        LOG_ERR("glfs_set_volfile_server", ret);
-
-        ret = glfs_set_logging (fs, logfile, 7);
-        LOG_ERR("glfs_set_logging", ret);
-
-        ret = glfs_init (fs);
-        LOG_ERR("second attempt glfs_init", ret);
-
-        subdir = glfs_h_create_from_handle (fs, subdir_handle, GFAPI_HANDLE_LENGTH,
-                                          &sb);
-        if (subdir == NULL) {
-                fprintf (stderr, "glfs_h_create_from_handle: error on create of %s: from (%p),%s\n",
-                         subdirname, subdir_handle, strerror (errno));
-                goto out;
-        }
-        dir = glfs_h_lookupat (fs, subdir, "..", &sb, 0);
-        if (dir == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on directory lookup dir using .. ,%s\n",
-                         strerror (errno));
-                goto out;
-        }
+    int ret = 0;
+    glfs_t *fs = NULL;
+    struct glfs_object *root = NULL, *dir = NULL, *subdir = NULL;
+    struct stat sb = {
+        0,
+    };
+    char *dirname = "dir";
+    char *subdirname = "subdir";
+    char *logfile = NULL;
+    char *volname = NULL;
+    char *hostname = NULL;
+    unsigned char subdir_handle[GFAPI_HANDLE_LENGTH] = {'\0'};
+
+    if (argc != 4) {
+        fprintf(stderr, "Invalid argument\n");
+        exit(1);
+    }
+
+    hostname = argv[1];
+    volname = argv[2];
+    logfile = argv[3];
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        ret = -1;
+        goto out;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    LOG_ERR("glfs_set_volfile_server", ret);
+
+    ret = glfs_set_logging(fs, logfile, 7);
+    LOG_ERR("glfs_set_logging", ret);
+
+    ret = glfs_init(fs);
+    LOG_ERR("first attempt glfs_init", ret);
+
+    root = glfs_h_lookupat(fs, NULL, "/", &sb, 0);
+    if (root == NULL) {
+        fprintf(stderr, "glfs_h_lookupat: error on lookup of / ,%s\n",
+                strerror(errno));
+        goto out;
+    }
+    dir = glfs_h_mkdir(fs, root, dirname, 0644, &sb);
+    if (dir == NULL) {
+        fprintf(stderr, "glfs_h_mkdir: error on directory creation dir ,%s\n",
+                strerror(errno));
+        goto out;
+    }
+    subdir = glfs_h_mkdir(fs, root, subdirname, 0644, &sb);
+    if (subdir == NULL) {
+        fprintf(stderr,
+                "glfs_h_mkdir: error on directory creation subdir ,%s\n",
+                strerror(errno));
+        goto out;
+    }
+    ret = glfs_h_extract_handle(subdir, subdir_handle, GFAPI_HANDLE_LENGTH);
+    if (ret < 0) {
+        fprintf(stderr,
+                "glfs_h_extract_handle: error extracting handle of %s: %s\n",
+                subdirname, strerror(errno));
+        goto out;
+    }
+
+    glfs_h_close(subdir);
+    subdir = NULL;
+    glfs_h_close(dir);
+    dir = NULL;
+
+    if (fs) {
+        ret = glfs_fini(fs);
+        fprintf(stderr, "glfs_fini(fs) returned %d \n", ret);
+    }
+
+    fs = NULL;
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        ret = -1;
+        goto out;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    LOG_ERR("glfs_set_volfile_server", ret);
+
+    ret = glfs_set_logging(fs, logfile, 7);
+    LOG_ERR("glfs_set_logging", ret);
+
+    ret = glfs_init(fs);
+    LOG_ERR("second attempt glfs_init", ret);
+
+    subdir = glfs_h_create_from_handle(fs, subdir_handle, GFAPI_HANDLE_LENGTH,
+                                       &sb);
+    if (subdir == NULL) {
+        fprintf(
+            stderr,
+            "glfs_h_create_from_handle: error on create of %s: from (%p),%s\n",
+            subdirname, subdir_handle, strerror(errno));
+        goto out;
+    }
+    dir = glfs_h_lookupat(fs, subdir, "..", &sb, 0);
+    if (dir == NULL) {
+        fprintf(stderr,
+                "glfs_h_lookupat: error on directory lookup dir using .. ,%s\n",
+                strerror(errno));
+        goto out;
+    }
 
 out:
-        if (subdir)
-                glfs_h_close (subdir);
-        if (dir)
-                glfs_h_close (dir);
-
-        if (fs) {
-                ret = glfs_fini(fs);
-                fprintf (stderr, "glfs_fini(fs) returned %d \n", ret);
-        }
-
-        if (ret)
-                exit(1);
-        exit(0);
+    if (subdir)
+        glfs_h_close(subdir);
+    if (dir)
+        glfs_h_close(dir);
+
+    if (fs) {
+        ret = glfs_fini(fs);
+        fprintf(stderr, "glfs_fini(fs) returned %d \n", ret);
+    }
+
+    if (ret)
+        exit(1);
+    exit(0);
 }
diff --git a/tests/bugs/gfapi/bug-1447266/bug-1447266.c b/tests/bugs/gfapi/bug-1447266/bug-1447266.c
index e4b3c888a57..2b7e2d627fe 100644
--- a/tests/bugs/gfapi/bug-1447266/bug-1447266.c
+++ b/tests/bugs/gfapi/bug-1447266/bug-1447266.c
@@ -4,102 +4,104 @@
 #include <string.h>
 #include <stdlib.h>
 #define TOTAL_ARGS 4
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-        char *cwd = (char *)malloc(PATH_MAX*sizeof(char *));
-        char *resolved = NULL;
-        char *result = NULL;
-        char *buf = NULL;
-        struct stat st;
-        char *path = NULL;
-        int ret;
-
-        if (argc != TOTAL_ARGS) {
-                printf ("Please give all required command line args.\n"
-                         "Format : <volname> <server_ip> <path_name>\n");
-                goto out;
-        }
-
-        glfs_t *fs = glfs_new (argv[1]);
-
-        if (fs == NULL) {
-                printf ("glfs_new: %s\n", strerror(errno));
-                /* No need to fail the test for this error */
-                ret = 0;
-                goto out;
-        }
-
-        ret = glfs_set_volfile_server(fs, "tcp", argv[2], 24007);
-        if (ret) {
-                printf ("glfs_set_volfile_server: %s\n", strerror(errno));
-                /* No need to fail the test for this error */
-                ret = 0;
-                goto out;
-        }
-
-        path = argv[3];
-
-        ret = glfs_set_logging(fs, "/tmp/gfapi.log", 7);
-        if (ret) {
-                printf ("glfs_set_logging: %s\n", strerror(errno));
-                /* No need to fail the test for this error */
-                ret = 0;
-                goto out;
-        }
-
-        ret = glfs_init(fs);
-        if (ret) {
-                printf ("glfs_init: %s\n", strerror(errno));
-                /* No need to fail the test for this error */
-                ret = 0;
-                goto out;
-        }
-
-        sleep(1);
-
-        ret = glfs_chdir(fs, path);
-        if (ret) {
-                printf ("glfs_chdir: %s\n", strerror(errno));
-                goto out;
-        }
-
-        buf = glfs_getcwd(fs, cwd, PATH_MAX);
-        if (cwd == NULL) {
-                printf ("glfs_getcwd: %s\n", strerror(errno));
-                goto out;
-        }
-
-        printf ("\ncwd = %s\n\n", cwd);
-
-        result = glfs_realpath(fs, path, resolved);
-        if (result == NULL) {
-                printf ("glfs_realpath: %s\n", strerror(errno));
-                goto out;
-        }
-
-        ret = glfs_stat(fs, path, &st);
-        if (ret) {
-                printf ("glfs_stat: %s\n", strerror(errno));
-                goto out;
-        }
-        if (cwd)
-                free(cwd);
-
-        result = glfs_realpath(fs, path, resolved);
-        if (result == NULL) {
-                printf ("glfs_realpath: %s\n", strerror(errno));
-                goto out;
-        }
-
-        ret = glfs_fini(fs);
-        if (ret) {
-                printf ("glfs_fini: %s\n", strerror(errno));
-                /* No need to fail the test for this error */
-                ret = 0;
-                goto out;
-        }
-
-        printf ("\n");
+    char *cwd = (char *)malloc(PATH_MAX * sizeof(char *));
+    char *resolved = NULL;
+    char *result = NULL;
+    char *buf = NULL;
+    struct stat st;
+    char *path = NULL;
+    int ret;
+
+    if (argc != TOTAL_ARGS) {
+        printf(
+            "Please give all required command line args.\n"
+            "Format : <volname> <server_ip> <path_name>\n");
+        goto out;
+    }
+
+    glfs_t *fs = glfs_new(argv[1]);
+
+    if (fs == NULL) {
+        printf("glfs_new: %s\n", strerror(errno));
+        /* No need to fail the test for this error */
+        ret = 0;
+        goto out;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", argv[2], 24007);
+    if (ret) {
+        printf("glfs_set_volfile_server: %s\n", strerror(errno));
+        /* No need to fail the test for this error */
+        ret = 0;
+        goto out;
+    }
+
+    path = argv[3];
+
+    ret = glfs_set_logging(fs, "/tmp/gfapi.log", 7);
+    if (ret) {
+        printf("glfs_set_logging: %s\n", strerror(errno));
+        /* No need to fail the test for this error */
+        ret = 0;
+        goto out;
+    }
+
+    ret = glfs_init(fs);
+    if (ret) {
+        printf("glfs_init: %s\n", strerror(errno));
+        /* No need to fail the test for this error */
+        ret = 0;
+        goto out;
+    }
+
+    sleep(1);
+
+    ret = glfs_chdir(fs, path);
+    if (ret) {
+        printf("glfs_chdir: %s\n", strerror(errno));
+        goto out;
+    }
+
+    buf = glfs_getcwd(fs, cwd, PATH_MAX);
+    if (cwd == NULL) {
+        printf("glfs_getcwd: %s\n", strerror(errno));
+        goto out;
+    }
+
+    printf("\ncwd = %s\n\n", cwd);
+
+    result = glfs_realpath(fs, path, resolved);
+    if (result == NULL) {
+        printf("glfs_realpath: %s\n", strerror(errno));
+        goto out;
+    }
+
+    ret = glfs_stat(fs, path, &st);
+    if (ret) {
+        printf("glfs_stat: %s\n", strerror(errno));
+        goto out;
+    }
+    if (cwd)
+        free(cwd);
+
+    result = glfs_realpath(fs, path, resolved);
+    if (result == NULL) {
+        printf("glfs_realpath: %s\n", strerror(errno));
+        goto out;
+    }
+
+    ret = glfs_fini(fs);
+    if (ret) {
+        printf("glfs_fini: %s\n", strerror(errno));
+        /* No need to fail the test for this error */
+        ret = 0;
+        goto out;
+    }
+
+    printf("\n");
 out:
-        return ret;
+    return ret;
 }
diff --git a/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c
index 68011171744..f38f01144d3 100644
--- a/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c
+++ b/tests/bugs/gfapi/glfs_vol_set_IO_ERR.c
@@ -10,156 +10,154 @@
 glfs_t *
 setup_new_client(char *hostname, char *volname, char *log_fileile)
 {
-        int ret = 0;
-        glfs_t *fs = NULL;
-
-        fs = glfs_new (volname);
-        if (!fs) {
-                fprintf (stderr, "\nglfs_new: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_logging (fs, log_fileile, 7);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_logging failed with ret: %d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_init (fs);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_init failed with ret: %d (%s)\n",
-                                  ret, strerror (errno));
-                goto error;
-        }
-        return fs;
+    int ret = 0;
+    glfs_t *fs = NULL;
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "\nglfs_new: returned NULL (%s)\n", strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_logging(fs, log_fileile, 7);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_logging failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_init(fs);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_init failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+    return fs;
 error:
-        return NULL;
+    return NULL;
 }
 
 int
-write_something (glfs_t *fs)
+write_something(glfs_t *fs)
 {
-        glfs_fd_t *fd       = NULL;
-        char      *buf      = NULL;
-        int       ret       = 0;
-        int       j         = 0;
-
-        fd = glfs_creat (fs, "filename", O_RDWR, 0644);
-        if (!fd) {
-                fprintf (stderr, "%s: (%p) %s\n", "filename", fd,
-                        strerror (errno));
-                return -1;
-        }
+    glfs_fd_t *fd = NULL;
+    char *buf = NULL;
+    int ret = 0;
+    int j = 0;
+
+    fd = glfs_creat(fs, "filename", O_RDWR, 0644);
+    if (!fd) {
+        fprintf(stderr, "%s: (%p) %s\n", "filename", fd, strerror(errno));
+        return -1;
+    }
+
+    buf = (char *)malloc(WRITE_SIZE);
+    memset(buf, '-', WRITE_SIZE);
 
-        buf = (char *) malloc (WRITE_SIZE);
-        memset (buf, '-', WRITE_SIZE);
-
-        for (j = 0; j < 4; j++) {
-                ret = glfs_write (fd, buf, WRITE_SIZE, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "Write(%s): %d (%s)\n", "filename", ret,
-                                strerror (errno));
-                        return ret;
-                }
-                glfs_lseek (fd, 0, SEEK_SET);
+    for (j = 0; j < 4; j++) {
+        ret = glfs_write(fd, buf, WRITE_SIZE, 0);
+        if (ret < 0) {
+            fprintf(stderr, "Write(%s): %d (%s)\n", "filename", ret,
+                    strerror(errno));
+            return ret;
         }
-        return 0;
+        glfs_lseek(fd, 0, SEEK_SET);
+    }
+    return 0;
 }
 
 static int
-volfile_change (const char *volname) {
-        int   ret = 0;
-        char *cmd = NULL, *cmd1 = NULL;
-
-        ret = asprintf (&cmd, "gluster volume set %s quick-read on",
-                        volname);
-        if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                return ret;
-        }
+volfile_change(const char *volname)
+{
+    int ret = 0;
+    char *cmd = NULL, *cmd1 = NULL;
 
-        ret = asprintf (&cmd1, "gluster volume set %s quick-read off",
-                        volname);
-        if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                return ret;
-        }
+    ret = asprintf(&cmd, "gluster volume set %s quick-read on", volname);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct cli command string (%s)",
+                strerror(errno));
+        return ret;
+    }
 
-        ret = system (cmd);
-        if (ret < 0) {
-                fprintf (stderr, "quick-read off on (%s) failed", volname);
-                return ret;
-        }
+    ret = asprintf(&cmd1, "gluster volume set %s quick-read off", volname);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct cli command string (%s)",
+                strerror(errno));
+        return ret;
+    }
 
-        ret = system (cmd1);
-        if (ret < 0) {
-                fprintf (stderr, "quick-read on on (%s) failed", volname);
-                return ret;
-        }
+    ret = system(cmd);
+    if (ret < 0) {
+        fprintf(stderr, "quick-read off on (%s) failed", volname);
+        return ret;
+    }
 
-        ret = system (cmd);
-        if (ret < 0) {
-                fprintf (stderr, "quick-read off on (%s) failed", volname);
-                return ret;
-        }
+    ret = system(cmd1);
+    if (ret < 0) {
+        fprintf(stderr, "quick-read on on (%s) failed", volname);
+        return ret;
+    }
 
-        free (cmd);
-        free (cmd1);
+    ret = system(cmd);
+    if (ret < 0) {
+        fprintf(stderr, "quick-read off on (%s) failed", volname);
         return ret;
+    }
+
+    free(cmd);
+    free(cmd1);
+    return ret;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int        ret      = 0;
-        glfs_t    *fs       = NULL;
-	char       buf[100];
-        glfs_fd_t *fd       = NULL;
-
-        if (argc != 4) {
-                fprintf (stderr,
-                                "Expect following args %s <hostname> <Vol> <log file location>\n"
-                                , argv[0]);
-                return -1;
-        }
-
-        fs = setup_new_client (argv[1], argv[2], argv[3]);
-	if (!fs)
-		goto error;
-
-        ret = volfile_change (argv[2]);
-        if (ret < 0)
-                goto error;
-
-        /* This is required as volfile change takes a while to reach this
-         * gfapi client and precess the graph change. Without this the issue
-         * cannot be reproduced as in cannot be tested.
-         */
-        sleep (10);
-
-	ret = write_something (fs);
-        if (ret < 0)
-                goto error;
-
-        ret = glfs_fini (fs);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                         ret, strerror (errno));
-                goto error;
-        }
-
-        return 0;
-error:
+    int ret = 0;
+    glfs_t *fs = NULL;
+    char buf[100];
+    glfs_fd_t *fd = NULL;
+
+    if (argc != 4) {
+        fprintf(
+            stderr,
+            "Expect following args %s <hostname> <Vol> <log file location>\n",
+            argv[0]);
         return -1;
+    }
+
+    fs = setup_new_client(argv[1], argv[2], argv[3]);
+    if (!fs)
+        goto error;
+
+    ret = volfile_change(argv[2]);
+    if (ret < 0)
+        goto error;
+
+    /* This is required as volfile change takes a while to reach this
+     * gfapi client and precess the graph change. Without this the issue
+     * cannot be reproduced as in cannot be tested.
+     */
+    sleep(10);
+
+    ret = write_something(fs);
+    if (ret < 0)
+        goto error;
+
+    ret = glfs_fini(fs);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    return 0;
+error:
+    return -1;
 }