[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc() |
Date: |
Wed, 23 May 2018 15:11:13 +0200 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/sheepdog.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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;
--
2.13.6
- [Qemu-block] [PULL 00/46] Block layer patches, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 01/46] qemu-iotests: Fix paths for NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 03/46] qemu-iotests: 086 doesn't work with NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 10/46] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 08/46] blockjob: Improve BlockJobInfo.offset/len documentation, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 06/46] qemu-iotests: Remove MIG_SOCKET from non-migration tests, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 02/46] qemu-iotests: Filter NFS paths, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc(),
Kevin Wolf <=
- [Qemu-block] [PULL 05/46] qemu-iotests: Add more tests to "migration" group, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 11/46] job: Add JobDriver.job_type, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 12/46] job: Add job_delete(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 07/46] blockjob: Update block-job-pause/resume documentation, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 17/46] job: Add Job.aio_context, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 18/46] job: Move defer_to_main_loop to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 09/46] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 16/46] job: Move cancelled to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 13/46] job: Maintain a list of all jobs, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 14/46] job: Move state transitions to Job, Kevin Wolf, 2018/05/23