| Message ID | 20230915184130.403366-6-den@openvz.org |
|---|---|
| State | New |
| Headers | show |
| Series | implement discard operation for Parallels images | expand |
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
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>
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 >
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 :-)
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
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(-)