[v1] implement discard operation for Parallels images

[PATCH 04/21] parallels: return earler in fail_format branch in parallels_open()

Posted by Denis V. Lunev 1 year, 1 month ago

We do not need to perform any deallocation/cleanup if wrong format is
detected.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 block/parallels.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/parallels.c b/block/parallels.c
index 1d5409f2ba..0f127427bf 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
 
 fail_format:
     error_setg(errp, "Image not in Parallels format");
-    ret = -EINVAL;
+    return -EINVAL;
+
 fail:
     /*
      * "s" object was allocated by g_malloc0 so we can safely
-- 
2.34.1

Re: [PATCH 04/21] parallels: return earler in fail_format branch in parallels_open()

Posted by Alexander Ivanov 1 year, 1 month ago

On 9/15/23 20:41, Denis V. Lunev wrote:
> We do not need to perform any deallocation/cleanup if wrong format is
> detected.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> ---
>   block/parallels.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 1d5409f2ba..0f127427bf 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
>   
>   fail_format:
>       error_setg(errp, "Image not in Parallels format");
> -    ret = -EINVAL;
> +    return -EINVAL;
> +
>   fail:
>       /*
>        * "s" object was allocated by g_malloc0 so we can safely
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>

Re: [PATCH 04/21] parallels: return earler in fail_format branch in parallels_open()

Posted by Alexander Ivanov 1 year, 1 month ago

This is not the case with this patch, but it seems that the 5 first 
"goto fail;" could be
replaced by returns. The first allocation, freeing at the "fail" label, 
is at 1127 line.
The next error handling and all the previous ones can make return 
instead goto fail.

On 9/15/23 20:41, Denis V. Lunev wrote:
> We do not need to perform any deallocation/cleanup if wrong format is
> detected.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> ---
>   block/parallels.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 1d5409f2ba..0f127427bf 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
>   
>   fail_format:
>       error_setg(errp, "Image not in Parallels format");
> -    ret = -EINVAL;
> +    return -EINVAL;
> +
>   fail:
>       /*
>        * "s" object was allocated by g_malloc0 so we can safely

-- 
Best regards,
Alexander Ivanov

Re: [PATCH 04/21] parallels: return earler in fail_format branch in parallels_open()

Posted by Denis V. Lunev 1 year, 1 month ago

On 9/18/23 10:14, Alexander Ivanov wrote:
> This is not the case with this patch, but it seems that the 5 first 
> "goto fail;" could be
> replaced by returns. The first allocation, freeing at the "fail" 
> label, is at 1127 line.
> The next error handling and all the previous ones can make return 
> instead goto fail.
>
> On 9/15/23 20:41, Denis V. Lunev wrote:
>> We do not need to perform any deallocation/cleanup if wrong format is
>> detected.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> ---
>>   block/parallels.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/parallels.c b/block/parallels.c
>> index 1d5409f2ba..0f127427bf 100644
>> --- a/block/parallels.c
>> +++ b/block/parallels.c
>> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, 
>> QDict *options, int flags,
>>     fail_format:
>>       error_setg(errp, "Image not in Parallels format");
>> -    ret = -EINVAL;
>> +    return -EINVAL;
>> +
>>   fail:
>>       /*
>>        * "s" object was allocated by g_malloc0 so we can safely
>
see next patch :-)

Re: [PATCH 04/21] parallels: return earler in fail_format branch in parallels_open()

Posted by Alexander Ivanov 1 year, 1 month ago

Oh, sorry, I see it in the next patch. =)

On 9/18/23 10:14, Alexander Ivanov wrote:
> This is not the case with this patch, but it seems that the 5 first 
> "goto fail;" could be
> replaced by returns. The first allocation, freeing at the "fail" 
> label, is at 1127 line.
> The next error handling and all the previous ones can make return 
> instead goto fail.
>
> On 9/15/23 20:41, Denis V. Lunev wrote:
>> We do not need to perform any deallocation/cleanup if wrong format is
>> detected.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> ---
>>   block/parallels.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/parallels.c b/block/parallels.c
>> index 1d5409f2ba..0f127427bf 100644
>> --- a/block/parallels.c
>> +++ b/block/parallels.c
>> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, 
>> QDict *options, int flags,
>>     fail_format:
>>       error_setg(errp, "Image not in Parallels format");
>> -    ret = -EINVAL;
>> +    return -EINVAL;
>> +
>>   fail:
>>       /*
>>        * "s" object was allocated by g_malloc0 so we can safely
>

-- 
Best regards,
Alexander Ivanov