From: Mykola Golub <mgolub@mirantis.com>
Date: Mon, 13 Feb 2017 09:45:56 +0000 (+0100)
Subject: rbd-nbd: no need to check image format any more
X-Git-Tag: v12.0.1~408^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2f9c75f3043c2bb102faa9bbcd5c3efff44a8c1;p=ceph.git

rbd-nbd: no need to check image format any more

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 08384d42eba5..f49ea6ade5a9 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -510,7 +510,6 @@ static int do_map()
   int fd[2];
   int nbd;
 
-  uint8_t old_format;
   librbd::image_info_t info;
 
   Preforker forker;
@@ -659,10 +658,6 @@ static int do_map()
     goto close_nbd;
   }
 
-  r = image.old_format(&old_format);
-  if (r < 0)
-    goto close_nbd;
-
   {
     uint64_t handle;