From: Sage Weil <sage@inktank.com>
Date: Wed, 3 Apr 2013 01:13:01 +0000 (-0700)
Subject: librbd: simplify diff_iterate calls to list_snaps
X-Git-Tag: v0.62~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e847e8b2c7926d60dee66fa638c639935f2289e;p=ceph.git

librbd: simplify diff_iterate calls to list_snaps

We don't need the size.  Use the simpler API call.

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

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 939a485587bb..55461aa3a700 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -2369,12 +2369,7 @@ reprotect_and_return_err:
 	ldout(ictx->cct, 20) << "diff_iterate object " << p->first << dendl;
 
 	librados::snap_set_t snap_set;
-	uint64_t size;
-
-	librados::ObjectReadOperation op;
-	op.stat(&size, NULL, NULL);
-	op.list_snaps(&snap_set, NULL);
-	int r = head_ctx.operate(p->first.name, &op, NULL);
+	int r = head_ctx.list_snaps(p->first.name, &snap_set);
 	if (r == -ENOENT) {
 	  if (from_snap_id == 0 && !parent_diff.empty()) {
 	    // report parent diff instead