From 4974a9c2842024db4695822592ec3bd9e727ea3e Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 28 Nov 2011 10:32:07 -0800 Subject: [PATCH] uclient: remove useless if-else based on snapid These are the same command anyway! Signed-off-by: Greg Farnum --- src/client/Client.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 78d12c8ed5f8f..2347f7ce984e8 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -5144,12 +5144,8 @@ int Client::_read_async(Fh *f, uint64_t off, uint64_t len, bufferlist *bl) Cond cond; bool done = false; Context *onfinish = new C_SafeCond(&flock, &cond, &done, &rvalue); - if (in->snapid == CEPH_NOSNAP) - r = objectcacher->file_read(&in->oset, &in->layout, in->snapid, - off, len, bl, 0, onfinish); - else - r = objectcacher->file_read(&in->oset, &in->layout, in->snapid, - off, len, bl, 0, onfinish); + r = objectcacher->file_read(&in->oset, &in->layout, in->snapid, + off, len, bl, 0, onfinish); if (r == 0) { while (!done) cond.Wait(client_lock); -- 2.39.5