From c283751db430acac3827e1bd1dadda0f63da1247 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 27 Apr 2015 19:53:30 +0200
Subject: [PATCH 300/325] ggate[cd]: Add BIO_FLUSH support

Let ggated transform BIO_FLUSH requests into fsync() calls.

Obtained from: ElectroBSD
---
 sbin/ggate/ggatec/ggatec.c |  8 +++++++-
 sbin/ggate/ggated/ggated.c | 23 ++++++++++++++++++-----
 sbin/ggate/shared/ggate.h  |  1 +
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index 171c25b7d781..b9f159ce272f 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -149,6 +149,11 @@ send_thread(void *arg __unused)
 		case BIO_WRITE:
 			hdr.gh_cmd = GGATE_CMD_WRITE;
 			break;
+		case BIO_FLUSH:
+			g_gate_log(LOG_DEBUG, "FLUSH request");
+			hdr.gh_cmd = GGATE_CMD_FLUSH;
+			assert(ggio.gctl_length == 0);
+			break;
 		default:
 			g_gate_log(LOG_NOTICE, "Unknown gctl_cmd: %i", ggio.gctl_cmd);
 			ggio.gctl_error = EOPNOTSUPP;
@@ -243,7 +248,8 @@ recv_thread(void *arg __unused)
 			break;
 		}
 		if (ggio.gctl_cmd != GGATE_CMD_READ &&
-		    ggio.gctl_cmd != GGATE_CMD_WRITE) {
+		    ggio.gctl_cmd != GGATE_CMD_WRITE &&
+		    ggio.gctl_cmd != GGATE_CMD_FLUSH) {
 			g_gate_xlog("Unexpected GGATE_CMD: %d", ggio.gctl_cmd);
 		}
 
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index edbf9b952ba7..12517a51d70f 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -672,8 +672,10 @@ recv_thread(void *arg)
 		 * Reject requests that violate assertions in disk_thread().
 		 */
 		if (req->r_cmd != GGATE_CMD_READ &&
-		    req->r_cmd != GGATE_CMD_WRITE) {
-			g_gate_xlog("Request contains invalid command.");
+		    req->r_cmd != GGATE_CMD_WRITE &&
+		    req->r_cmd != GGATE_CMD_FLUSH) {
+			g_gate_xlog("Request contains invalid command: %d",
+			    req->r_cmd);
 		}
 		if (req->r_offset + req->r_length >
 		    (uintmax_t)conn->c_mediasize) {
@@ -696,9 +698,10 @@ recv_thread(void *arg)
 		}
 
 		/*
-		 * Allocate memory for data.
+		 * Allocate memory for data, except when flushing.
 		 */
-		req->r_data = malloc_waitok(req->r_length);
+		req->r_data = req->r_cmd != GGATE_CMD_FLUSH ?
+                    malloc_waitok(req->r_length) : NULL;
 
 		/*
 		 * Receive data to write for WRITE request.
@@ -758,7 +761,9 @@ disk_thread(void *arg)
 		/*
 		 * Check the request.
 		 */
-		assert(req->r_cmd == GGATE_CMD_READ || req->r_cmd == GGATE_CMD_WRITE);
+		assert(req->r_cmd == GGATE_CMD_READ ||
+		    req->r_cmd == GGATE_CMD_WRITE ||
+		    req->r_cmd == GGATE_CMD_FLUSH);
 		assert(req->r_offset + req->r_length <= (uintmax_t)conn->c_mediasize);
 		assert((req->r_offset % conn->c_sectorsize) == 0);
 		assert((req->r_length % conn->c_sectorsize) == 0);
@@ -782,6 +787,14 @@ disk_thread(void *arg)
 			free(req->r_data);
 			req->r_data = NULL;
 			break;
+		case GGATE_CMD_FLUSH:
+			g_gate_log(LOG_DEBUG, "Flushing");
+			if (fsync(fd)) {
+				req->r_error = errno;
+				g_gate_log(LOG_ERR, "Flushing failed: %s",
+				    strerror(errno));
+			}
+			break;
 		}
 		if (data != (ssize_t)req->r_length) {
 			/* Report short reads/writes as I/O errors. */
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index 9ea901036726..a649e7fd322d 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -57,6 +57,7 @@
 
 #define	GGATE_CMD_READ		0
 #define	GGATE_CMD_WRITE		1
+#define	GGATE_CMD_FLUSH		2
 
 extern int g_gate_devfd;
 extern int g_gate_verbose;
-- 
2.32.0