Merge remote branch 'origin/stable' into next

Conflicts:
	src/librbd.cc

diff --cc src/librbd.cc
index c390f57acc1ce94886327f41f1e94c1b22ea8d39,2cfb2efb05844abade0ebe4934f761de58350aa4..82935dab241ba62b1737c9dd255aa84a0d5824f9
--- 1/src/librbd.cc
--- 2/src/librbd.cc
+++ b/src/librbd.cc
@@@ -1123,9 -1114,10 +1123,10 @@@ int64_t read_iterate(ImageCtx *ictx, ui
    int64_t ret;
    int64_t total_read = 0;
    ictx->lock.Lock();
 -  uint64_t start_block = get_block_num(&ictx->header, off);
 -  uint64_t end_block = get_block_num(&ictx->header, off + len);
 -  uint64_t block_size = get_block_size(&ictx->header);
 -  uint64_t base = off - get_block_ofs(&ictx->header, off);
 +  uint64_t start_block = get_block_num(ictx->header, off);
 +  uint64_t end_block = get_block_num(ictx->header, off + len);
 +  uint64_t block_size = get_block_size(ictx->header);
++  uint64_t base = off - get_block_ofs(ictx->header, off);
    ictx->lock.Unlock();
    uint64_t left = len;