block/backup: drop dead code from backup_job_create

[PATCH] block/backup: drop dead code from backup_job_create

Vladimir Sementsov-Ogievskiy posted 1 patch 4 years, 8 months ago

Download mbox

Test FreeBSD passed

Test asan passed

Test checkpatch passed

Test docker-clang@ubuntu passed

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191017142122.20897-1-vsementsov@virtuozzo.com

Maintainers: Kevin Wolf <kwolf@redhat.com>, John Snow <jsnow@redhat.com>, Max Reitz <mreitz@redhat.com>

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

Expand all Fold all

[PATCH] block/backup: drop dead code from backup_job_create

Posted by Vladimir Sementsov-Ogievskiy 4 years, 8 months ago

After commit 00e30f05de1d195, there is no more "goto error" points
after job creation, so after "error:" @job is always NULL and we don't
need roll-back job creation.

Reported-by: Coverity (CID 1406402)
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/backup.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/block/backup.c b/block/backup.c
index 46978c1785..6e1497f7bb 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -474,10 +474,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     if (sync_bitmap) {
         bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL);
     }
-    if (job) {
-        backup_clean(&job->common.job);
-        job_early_fail(&job->common.job);
-    } else if (backup_top) {
+    if (backup_top) {
         bdrv_backup_top_drop(backup_top);
     }
 
-- 
2.21.0

Re: [PATCH] block/backup: drop dead code from backup_job_create

Posted by Stefano Garzarella 4 years, 8 months ago

Hi Vladimir,

On Thu, Oct 17, 2019 at 05:21:22PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> After commit 00e30f05de1d195, there is no more "goto error" points
> after job creation, so after "error:" @job is always NULL and we don't
> need roll-back job creation.

I don't know this code very well, but IIUC only block_job_add_bdrv() could
fail after the job creation, but this shouldn't happen because "Required
permissions are already taken by backup-top target", so it seems safe
for me:

Acked-by: Stefano Garzarella <sgarzare@redhat.com>

Thanks,
Stefano

> 
> Reported-by: Coverity (CID 1406402)
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  block/backup.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/block/backup.c b/block/backup.c
> index 46978c1785..6e1497f7bb 100644
> --- a/block/backup.c
> +++ b/block/backup.c
> @@ -474,10 +474,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
>      if (sync_bitmap) {
>          bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL);
>      }
> -    if (job) {
> -        backup_clean(&job->common.job);
> -        job_early_fail(&job->common.job);
> -    } else if (backup_top) {
> +    if (backup_top) {
>          bdrv_backup_top_drop(backup_top);
>      }
>  
> -- 
> 2.21.0
> 
>

Re: [PATCH] block/backup: drop dead code from backup_job_create

Posted by Kevin Wolf 4 years, 8 months ago

Am 17.10.2019 um 16:21 hat Vladimir Sementsov-Ogievskiy geschrieben:
> After commit 00e30f05de1d195, there is no more "goto error" points
> after job creation, so after "error:" @job is always NULL and we don't
> need roll-back job creation.
> 
> Reported-by: Coverity (CID 1406402)
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Thanks, applied to the block branch.

Kevin