From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Feb 2016 16:02:12 +0000 (-0500)
Subject: Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph
X-Git-Tag: v10.0.4~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87efba42fea98d40e4e643d6334bf2b9402b8b54;p=ceph.git

Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph

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

87efba42fea98d40e4e643d6334bf2b9402b8b54
diff --cc src/os/bluestore/BlueStore.h
index 1c4fdc48bd96,728201f51f1d..edb817c7c3c2
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@@ -296,7 -322,9 +322,9 @@@ public
  
      CollectionRef first_collection;  ///< first referenced collection
  
+     utime_t start;
+ 
 -    TransContext(OpSequencer *o)
 +    explicit TransContext(OpSequencer *o)
        : state(STATE_PREPARE),
  	osr(o),
  	ops(0),