respond to get file size

[fio.git] / engines / glusterfs.c

diff --git a/engines/glusterfs.c b/engines/glusterfs.c
index 62893af9c3d5b05cb33a83e67cc23d8d282c7ca1..6aed265a36ddc344f5172f40263fe3b6abde314f 100644 (file)
--- a/engines/glusterfs.c
+++ b/engines/glusterfs.c
@@ -107,15 +107,13 @@ 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;