From: Sage Weil <sage@newdream.net>
Date: Wed, 22 Jun 2011 17:09:48 +0000 (-0700)
Subject: Merge remote branch 'origin/stable' into next
X-Git-Tag: v0.30~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fe6a15d7ba86fe74586eff12bc24a03f1560c51;p=ceph.git

Merge remote branch 'origin/stable' into next

Conflicts:
	src/librbd.cc
---

0fe6a15d7ba86fe74586eff12bc24a03f1560c51
diff --cc src/librbd.cc
index c390f57acc1c,2cfb2efb0584..82935dab241b
--- a/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;