Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 03d189b7d77f66ce4f4dba9885d34c7a55ff4e53:

  diskutil: don't print terse disk util twice for json,terse output format (2016-02-09 13:45:50 -0700)

are available in the git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 8a768c2e725d6a527b904570949f6099c3f1434a:

  server: don't make SO_REUSEPORT errors fatal (2016-02-10 08:32:13 -0700)

----------------------------------------------------------------
Jens Axboe (1):
      server: don't make SO_REUSEPORT errors fatal

 server.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

---

Diff of recent changes:

diff --git a/server.c b/server.c
index c3e034c..6416a5c 100644
--- a/server.c
+++ b/server.c
@@ -1916,11 +1916,10 @@ static int fio_init_server_ip(void)
 		return -1;
 	}
 #ifdef SO_REUSEPORT
-	if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
-		log_err("fio: setsockopt(REUSEPORT): %s\n", strerror(errno));
-		close(sk);
-		return -1;
-	}
+	/*
+	 * Not fatal if fails, so just ignore it if that happens
+	 */
+	setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
 #endif
 
 	if (use_ipv6) {