From 9bb76bd1117983d23f89d8ef93440f4ec98389a5 Mon Sep 17 00:00:00 2001
From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 21 Mar 2019 09:33:28 +0800
Subject: [PATCH 2/2] glfs: fix build error for GFAPI version check

If the GFAPI version < 7.6, we will hit:

glfs.c:570:19: error: operator '<' has no left operand
^

Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 CMakeLists.txt | 6 ++++--
 glfs.c         | 6 +++---
 version.h.in   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc8d2f2..21a4fe7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,9 +224,11 @@ endif (with-rbd)
 if (with-glfs)
 	find_library(GFAPI gfapi)
 
-	pkg_check_modules(GFAPI760 glusterfs-api>=7.6)
+    set(GFAPI_VERSION760 0)
+
+    pkg_check_modules(GFAPI760 glusterfs-api>=7.6 QUIET)
 	if (GFAPI760_FOUND)
-		set(GFAPI_VERSION 760)
+		set(GFAPI_VERSION760 1)
 	endif (GFAPI760_FOUND)
 
 	# Stuff for building the glfs handler
diff --git a/glfs.c b/glfs.c
index 610133f..40326fd 100644
--- a/glfs.c
+++ b/glfs.c
@@ -567,13 +567,13 @@ static void tcmu_glfs_close(struct tcmu_device *dev)
 	free(gfsp);
 }
 
-#if GFAPI_VERSION < 760
-static void glfs_async_cbk(glfs_fd_t *fd, ssize_t ret, void *data)
-#else
+#if GFAPI_VERSION760
 static void glfs_async_cbk(glfs_fd_t *fd, ssize_t ret,
 			   struct glfs_stat *prestat,
 			   struct glfs_stat *poststat,
 			   void *data)
+#else
+static void glfs_async_cbk(glfs_fd_t *fd, ssize_t ret, void *data)
 #endif
 {
 	glfs_cbk_cookie *cookie = data;
diff --git a/version.h.in b/version.h.in
index 516a366..dd88a37 100644
--- a/version.h.in
+++ b/version.h.in
@@ -3,4 +3,4 @@
 
 #define DEFAULT_HANDLER_PATH "@tcmu-runner_HANDLER_PATH@"
 
-#define GFAPI_VERSION @GFAPI_VERSION@
+#define GFAPI_VERSION760 @GFAPI_VERSION760@
-- 
2.14.3