From: chenh <hchen@redhat.com>
Date: Fri, 28 Mar 2014 19:08:42 +0000 (-0400)
Subject: respond to get file size
X-Git-Tag: fio-2.1.10~13^2~6
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=334d5177e087b9864540691f3a34d4ceacc55416

respond to get file size
---

diff --git a/engines/glusterfs.c b/engines/glusterfs.c
index 62893af9..6aed265a 100644
--- 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;