From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 25 Nov 2019 15:27:38 +0000 (+0100)
Subject: crimson/osd/osd_operation.h: clean up duplicative check.
X-Git-Tag: v15.1.0~750^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8c1e4e34932e703c8553c3921b28da55da27eb23;p=ceph.git

crimson/osd/osd_operation.h: clean up duplicative check.

`seastar::future<T>::available()` already verifies whether
a future instance stores exception inside. It's unnecessary
to ensure that with further call to `failed()`.

This tiny clean-up removes the duplicative check in
`with_blocking_future()`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h
index 9d7861a0292d4..6fe98d6df08a2 100644
--- a/src/crimson/osd/osd_operation.h
+++ b/src/crimson/osd/osd_operation.h
@@ -146,7 +146,7 @@ public:
 
   template <typename... T>
   seastar::future<T...> with_blocking_future(blocking_future<T...> &&f) {
-    if (f.fut.available() || f.fut.failed()) {
+    if (f.fut.available()) {
       return std::move(f.fut);
     }
     assert(f.blocker);