From: Josh Durgin <josh.durgin@inktank.com>
Date: Sat, 30 Mar 2013 00:06:08 +0000 (-0700)
Subject: rbd: remove alway-true else condition in import-diff
X-Git-Tag: v0.62~118^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a1cbf3e742cf5f61446e28fd31268d93ab48bde;p=ceph.git

rbd: remove alway-true else condition in import-diff

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 5099e27b16e..f6cdb583905 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -1479,7 +1479,7 @@ static int do_import_diff(librbd::Image &image, const char *path)
 	data.append(bp);
 	dout(2) << " write " << off << "~" << len << dendl;
 	image.write(off, len, data);
-      } else if (tag == 'z') {
+      } else {
 	dout(2) << " zero " << off << "~" << len << dendl;
 	image.discard(off, len);
       }