From: Nathan Cutler <presnypreklad@gmail.com>
Date: Wed, 19 Jul 2017 10:50:22 +0000 (+0200)
Subject: Merge pull request #14540 from smithfarm/wip-18910-kraken
X-Git-Tag: v11.2.1~55
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=771ebef418eb0d585ca9bd9dd565ea9f1caf3766;p=ceph.git

Merge pull request #14540 from smithfarm/wip-18910-kraken

kraken: rbd-nbd: check /sys/block/nbdX/size to ensure kernel mapped correctly

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

771ebef418eb0d585ca9bd9dd565ea9f1caf3766
diff --cc src/tools/rbd_nbd/rbd-nbd.cc
index c3f4c5cf515ef,ea9008bc531d0..4971cb1181cae
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@@ -75,8 -76,9 +76,10 @@@ static bool readonly = false
  static int nbds_max = 0;
  static int max_part = 255;
  static bool exclusive = false;
 +static int nbd = -1;
  
+ #define RBD_NBD_BLKSIZE 512UL
+ 
  #ifdef CEPH_BIG_ENDIAN
  #define ntohll(a) (a)
  #elif defined(CEPH_LITTLE_ENDIAN)
@@@ -492,7 -504,9 +517,8 @@@ static int do_map(int argc, const char 
    unsigned long flags;
    unsigned long size;
  
+   int index = 0;
    int fd[2];
 -  int nbd;
  
    uint8_t old_format;
    librbd::image_info_t info;