]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: update for osd_command/mon_command void change
authorJohn Spray <john.spray@redhat.com>
Sat, 4 Feb 2017 21:20:04 +0000 (21:20 +0000)
committerJohn Spray <john.spray@redhat.com>
Thu, 9 Mar 2017 13:30:06 +0000 (13:30 +0000)
Signed-off-by: John Spray <john.spray@redhat.com>
src/librados/RadosClient.cc

index 8950a900cf242cc82761720bf1d20d86492f1d32..c776efa2e7c49c9d3cdc335a491a9b142ba9c65b 100644 (file)
@@ -888,10 +888,9 @@ int librados::RadosClient::osd_command(int osd, vector<string>& cmd,
 
   lock.Lock();
   // XXX do anything with tid?
-  int r = objecter->osd_command(osd, cmd, inbl, &tid, poutbl, prs,
-                        new C_SafeCond(&mylock, &cond, &done, &ret));
+  objecter->osd_command(osd, cmd, inbl, &tid, poutbl, prs,
+                       new C_SafeCond(&mylock, &cond, &done, &ret));
   lock.Unlock();
-  assert(r == 0);
   mylock.Lock();
   while (!done)
     cond.Wait(mylock);
@@ -909,10 +908,9 @@ int librados::RadosClient::pg_command(pg_t pgid, vector<string>& cmd,
   int ret;
   ceph_tid_t tid;
   lock.Lock();
-  int r = objecter->pg_command(pgid, cmd, inbl, &tid, poutbl, prs,
-                       new C_SafeCond(&mylock, &cond, &done, &ret));
+  objecter->pg_command(pgid, cmd, inbl, &tid, poutbl, prs,
+                      new C_SafeCond(&mylock, &cond, &done, &ret));
   lock.Unlock();
-  assert(r == 0);
   mylock.Lock();
   while (!done)
     cond.Wait(mylock);