From: Willem Jan Withagen <wjw@digiware.nl>
Date: Thu, 5 Jan 2017 11:20:38 +0000 (+0100)
Subject: tools/rbd/action/Kernel.cc: create stubs for FreeBSD
X-Git-Tag: v12.0.0~174^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d28554060d968ced921c2bd8ba04ad00c8d91c0;p=ceph-ci.git

tools/rbd/action/Kernel.cc: create stubs for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index dd92974c449..8576904cbbc 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -139,6 +139,9 @@
 /* define if rbd enabled */
 #cmakedefine WITH_RBD
 
+/* define if kernel rbd enabled */
+#cmakedefine WITH_KRBD
+
 /* define if key-value-store is enabled */
 #cmakedefine WITH_KVS
 
diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
index ee640062ce8..5720dc09325 100644
--- a/src/tools/rbd/action/Kernel.cc
+++ b/src/tools/rbd/action/Kernel.cc
@@ -1,6 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "acconfig.h"
 #include "tools/rbd/ArgumentTypes.h"
 #include "tools/rbd/Shell.h"
 #include "tools/rbd/Utils.h"
@@ -163,6 +164,7 @@ static int parse_unmap_options(char *options)
 
 static int do_kernel_showmapped(Formatter *f)
 {
+#if defined(WITH_KRBD)
   struct krbd_ctx *krbd;
   int r;
 
@@ -174,6 +176,10 @@ static int do_kernel_showmapped(Formatter *f)
 
   krbd_destroy(krbd);
   return r;
+#else
+  return -1;
+#endif
+
 }
 
 /*
@@ -218,6 +224,7 @@ static void print_error_description(const char *poolname, const char *imgname,
 static int do_kernel_map(const char *poolname, const char *imgname,
                          const char *snapname)
 {
+#if defined(WITH_KRBD)
   struct krbd_ctx *krbd;
   std::ostringstream oss;
   char *devnode;
@@ -254,11 +261,15 @@ static int do_kernel_map(const char *poolname, const char *imgname,
 out:
   krbd_destroy(krbd);
   return r;
+#else
+  return -1;
+#endif
 }
 
 static int do_kernel_unmap(const char *dev, const char *poolname,
                            const char *imgname, const char *snapname)
 {
+#if defined(WITH_KRBD)
   struct krbd_ctx *krbd;
   std::ostringstream oss;
   int r;
@@ -281,6 +292,10 @@ static int do_kernel_unmap(const char *dev, const char *poolname,
 
   krbd_destroy(krbd);
   return r;
+#else
+  return -1;
+#endif
+
 }
 
 void get_show_arguments(po::options_description *positional,