| Message ID | 7a6e1a43-d041-c3cf-a3dd-a9761d8dd4d6@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | tune2fs: tune2fs_main() should return rc when some error, occurs | expand |
Reviewed-by: Artem Blagodarenko <artem.blagodarenko@gmail.com> > On 5 Sep 2022, at 18:40, Zhiqiang Liu <liuzhiqiang26@huawei.com> wrote: > > > If some error occurs, tune2fs_main() will go to closefs tag for > releasing resource, and it should return correct value (rc) instead > of 0 when ext2fs_close_free(&fs) successes. > > Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> > --- > misc/tune2fs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/misc/tune2fs.c b/misc/tune2fs.c > index 25ade2fa..088f87e5 100644 > --- a/misc/tune2fs.c > +++ b/misc/tune2fs.c > @@ -3481,6 +3481,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" > fputs(_("Error in using clear_mmp. " > "It must be used with -f\n"), > stderr); > + rc = 1; > goto closefs; > } > } > @@ -3744,5 +3745,5 @@ closefs: > > if (feature_64bit) > convert_64bit(fs, feature_64bit); > - return (ext2fs_close_free(&fs) ? 1 : 0); > + return (ext2fs_close_free(&fs) ? 1 : rc); > } > -- > 2.33.0 > >
On Mon, 5 Sep 2022 23:40:01 +0800, Zhiqiang Liu wrote: > If some error occurs, tune2fs_main() will go to closefs tag for > releasing resource, and it should return correct value (rc) instead > of 0 when ext2fs_close_free(&fs) successes. > > Applied, thanks! [1/1] tune2fs: tune2fs_main() should return rc when some error, occurs commit: 77ac16dfba42e0d152b1e99359e01a933f8cc6f9 Best regards,
diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 25ade2fa..088f87e5 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -3481,6 +3481,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" fputs(_("Error in using clear_mmp. " "It must be used with -f\n"), stderr); + rc = 1; goto closefs; } } @@ -3744,5 +3745,5 @@ closefs: if (feature_64bit) convert_64bit(fs, feature_64bit); - return (ext2fs_close_free(&fs) ? 1 : 0); + return (ext2fs_close_free(&fs) ? 1 : rc); }
If some error occurs, tune2fs_main() will go to closefs tag for releasing resource, and it should return correct value (rc) instead of 0 when ext2fs_close_free(&fs) successes. Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> --- misc/tune2fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)