From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Dec 2016 23:16:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/kraken'
X-Git-Tag: v12.0.0~390
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=926d27fc2493fd3fc879f8d45402550fea363daa;p=ceph.git

Merge remote-tracking branch 'gh/kraken'

# Conflicts:
#	src/os/bluestore/BlueStore.cc
---

926d27fc2493fd3fc879f8d45402550fea363daa
diff --cc src/os/bluestore/BlueStore.cc
index 54dd77f8b10,2ca7882085d..a4acb10b0f8
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -1681,10 -1661,7 +1681,9 @@@ bool BlueStore::ExtentMap::update(KeyVa
          }
  	assert(p->shard_info->offset == p->offset);
  	p->shard_info->bytes = len;
- 	p->shard_info->extents = nn;
 -	t->set(PREFIX_OBJ, p->key, bl);
 +        
 +        encoded_shards[pos].key = &p->key;
 +        dirty_shards.push_back(encoded_shards[pos]);
  	p->dirty = false;
        }
        p = n;