From: Sage Weil <sage@redhat.com>
Date: Sat, 19 Dec 2015 19:02:02 +0000 (-0500)
Subject: Merge pull request #6766 from xiexingguo/xxg-wip-cleanup
X-Git-Tag: v10.0.3~192
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dca87c63c4d7bf1866783db39dcac53962f86f2;p=ceph.git

Merge pull request #6766 from xiexingguo/xxg-wip-cleanup

osd: fix wrongly placed assert and some cleanups

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

7dca87c63c4d7bf1866783db39dcac53962f86f2