From 8e524c89ea40c26fc922cd7f993ea61d34e2b862 Mon Sep 17 00:00:00 2001 From: John Spray Date: Sat, 4 Feb 2017 21:20:04 +0000 Subject: [PATCH] librados: update for osd_command/mon_command void change Signed-off-by: John Spray --- src/librados/RadosClient.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 8950a900cf2..c776efa2e7c 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -888,10 +888,9 @@ int librados::RadosClient::osd_command(int osd, vector& 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& 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); -- 2.47.3