From cc433f1cee0a41b29ebdc8aef6c5337e5d9be577 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 7 Jul 2014 11:52:31 +0200
Subject: [PATCH] feature #2877: Added RBD Format 2 to mkfs

---
 src/datastore_mad/remotes/ceph/mkfs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs
index 4556884ca7..c2d4fdc101 100755
--- a/src/datastore_mad/remotes/ceph/mkfs
+++ b/src/datastore_mad/remotes/ceph/mkfs
@@ -92,19 +92,23 @@ fi
 
 MKFS_CMD=`mkfs_command $TMP_DST $FSTYPE $SIZE`
 
+if [ "$RBD_FORMAT" = "2" ]; then
+    FORMAT_OPT="--image-format 2"
+fi
+
 REGISTER_CMD=$(cat <<EOF
     set -e
     export PATH=/usr/sbin:/sbin:\$PATH
 
     if [ "$FSTYPE" = "raw" ]; then
-        $QEMU_IMG create rbd:$RBD_SOURCE ${SIZE}M
+        $RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE}
     else
         # create and format
         $DD if=/dev/zero of=$TMP_DST bs=1 count=1 seek=${SIZE}M
         $MKFS_CMD
 
         # create rbd
-        $QEMU_IMG convert $QEMU_IMG_CONVERT_ARGS $TMP_DST rbd:$RBD_SOURCE
+        $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
 
         # remove original
         $RM -f $TMP_DST