[PULL,04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc()

Message ID 20180523131155.12359-5-kwolf@redhat.com
State New
Headers show
Series
  • Untitled series #11607
Related show

Commit Message

Kevin Wolf May 23, 2018, 1:11 p.m.
From: Peter Maydell <peter.maydell@linaro.org>


In commit 8b9ad56e9cbfd852a, we removed the code that could result
in our getting to sd_prealloc()'s out_with_err_set label with a
NULL blk pointer. That makes the NULL check in the error-handling
path unnecessary, and Coverity gripes about it (CID 1390636).
Delete the redundant check.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---
 block/sheepdog.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
2.13.6

Patch

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 4237132419..2a5bc0a59a 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1859,9 +1859,7 @@  out:
         error_setg_errno(errp, -ret, "Can't pre-allocate");
     }
 out_with_err_set:
-    if (blk) {
-        blk_unref(blk);
-    }
+    blk_unref(blk);
     g_free(buf);
 
     return ret;