block/backup: drop dead code from backup_job_create
PATCH 1/1 block/backup: drop dead code from backup_job_create
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.
--- block/backup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
block/backup.c +1 -4
@@ -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); }
Signature · 1 line
2.21.0
Hi Vladimir,
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
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:
Thanks,
Stefano
Quoted 27 lines
Reported-by Coverity (CID 1406402)Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/backup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)block/backup.c +1
-4@@ -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); }Signature · 1 line
2.21.0
Kevin Wolf
AppliedAm 17.10.2019 um 16:21 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 6 lines
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 <[email protected]>
Thanks, applied to the block branch.
Kevin