From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Jan 2016 14:03:29 +0000 (-0500)
Subject: Merge pull request #7059 from xiexingguo/xxg-wip-14187
X-Git-Tag: v10.0.3~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7ee4f3ff660eec6101d7b7d2a2bd4d0c5e6d4e3;p=ceph.git

Merge pull request #7059 from xiexingguo/xxg-wip-14187

osd: misc FileStore fixes

Reviewed-by: Sage Weil <sage@redhat.com>
---

e7ee4f3ff660eec6101d7b7d2a2bd4d0c5e6d4e3