From: Sage Weil <sage@inktank.com>
Date: Fri, 14 Mar 2014 20:04:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-coverity-20140409'
X-Git-Tag: v0.79~150
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74ad3e30d5a6f5fa3d020527518ceb3dca9c4aa0;p=ceph.git

Merge remote-tracking branch 'gh/wip-coverity-20140409'

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

74ad3e30d5a6f5fa3d020527518ceb3dca9c4aa0
diff --cc src/osd/ReplicatedPG.h
index 8a45177fd1d0,2737d0d5cf6e..52a77174c0fe
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@@ -122,10 -122,9 +122,10 @@@ public
      snapid_t snap_seq;       ///< src's snap_seq (if head)
      librados::snap_set_t snapset; ///< src snapset (if head)
      bool mirror_snapset;
 +    map<string, bufferlist> attrs; ///< src user attrs
      CopyResults() : object_size(0), started_temp_obj(false),
- 		    user_version(0), should_requeue(false),
- 		    mirror_snapset(false) {}
+ 		    final_tx(NULL), user_version(0), 
+ 		    should_requeue(false), mirror_snapset(false) {}
    };
  
    struct CopyOp {