From: Sage Weil <sage@inktank.com>
Date: Sun, 17 Jun 2012 16:07:41 +0000 (-0700)
Subject: cls_rbd: do not pass snapid_t to vargs
X-Git-Tag: v0.48argonaut~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d4ba4319ce0206d8201295576d495ef56783121;p=ceph.git

cls_rbd: do not pass snapid_t to vargs

On squeeze,

warning: cls_rbd.cc:534: cannot pass objects of non-POD type ‘struct snapid_t’ through ‘...’; call will abort at runtime

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

diff --git a/src/cls_rbd.cc b/src/cls_rbd.cc
index f8ae50f50aaa..c03f99bdb5ea 100644
--- a/src/cls_rbd.cc
+++ b/src/cls_rbd.cc
@@ -531,7 +531,7 @@ int snapshot_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 	::decode(old_meta, iter);
       } catch (const buffer::error &err) {
 	snapid_t snap_id = snap_id_from_key(it->first);
-	CLS_ERR("error decoding snapshot metadata for snap_id: %llu", snap_id);
+	CLS_ERR("error decoding snapshot metadata for snap_id: %llu", snap_id.val);
 	return -EIO;
       }
       if (snap_meta.name == old_meta.name || snap_meta.id == old_meta.id) {