update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / rados / PoolDump.cc

diff --git a/ceph/src/tools/rados/PoolDump.cc b/ceph/src/tools/rados/PoolDump.cc
index ad7a1a4dfefb85406cbf16d5011858ae90da4c5c..747e9c62dbc41fb17cbe1ce3deb2d40f8251043a 100644 (file)
--- a/ceph/src/tools/rados/PoolDump.cc
+++ b/ceph/src/tools/rados/PoolDump.cc
@@ -30,7 +30,7 @@ using namespace librados;
  */
 int PoolDump::dump(IoCtx *io_ctx)
 {
-  assert(io_ctx != NULL);
+  ceph_assert(io_ctx != NULL);
 
   int r = 0;
   write_super();
@@ -87,7 +87,6 @@ int PoolDump::dump(IoCtx *io_ctx)
 
       if (outdata.length() < op_size) {
         // No more data
-        r = 0;
         break;
       }
       offset += outdata.length();
@@ -151,7 +150,6 @@ int PoolDump::dump(IoCtx *io_ctx)
       }
       r = values.size();
     } while (r == MAX_READ);
-    r = 0;
 
     // Close object
     // =============