respond to get file size

[fio.git] / engines / glusterfs.c

diff --git a/engines/glusterfs.c b/engines/glusterfs.c
index a89aeb859438bf9e1e2aa7166b1823a0214bda6f..62893af9c3d5b05cb33a83e67cc23d8d282c7ca1 100644 (file)
--- a/engines/glusterfs.c
+++ b/engines/glusterfs.c
@@ -107,6 +107,15 @@ static int fio_gf_get_file_size(struct thread_data *td, struct fio_file *f)
     int ret;
     struct gf_data *g = td->io_ops->data;
 
+<<<<<<< HEAD
+    dprint(FD_FILE, "get file size %s\n", f->file_name);
+
+    if (!g || !g->fs)
+    {
+       return 0;
+    }
+=======
+>>>>>>> parent of 6aa5650... make glfs call per thread based
     if (fio_file_size_known(f))
        return 0;