| Message ID | 20180518181717.6700-1-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | sheepdog: Remove unnecessary NULL check in sd_prealloc() | expand |
Am 18.05.2018 um 20:17 hat Peter Maydell geschrieben: > 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> In fact, it was unnecessary even before that, because blk_unref(NULL) is valid (it does nothing). Thanks, applied to the block branch. Kevin
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;
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> --- block/sheepdog.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)