On Wed 18-11-20 09:47:49, Christoph Hellwig wrote: > Avoid a totally pointless goto label, and use the same style of > comparism for both helpers. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> OK. You can add: Reviewed-by: Jan Kara <jack@xxxxxxx> Honza > --- > init/do_mounts.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/init/do_mounts.c b/init/do_mounts.c > index afa26a4028d25e..5879edf083b318 100644 > --- a/init/do_mounts.c > +++ b/init/do_mounts.c > @@ -79,15 +79,10 @@ static int match_dev_by_uuid(struct device *dev, const void *data) > const struct uuidcmp *cmp = data; > struct hd_struct *part = dev_to_part(dev); > > - if (!part->info) > - goto no_match; > - > - if (strncasecmp(cmp->uuid, part->info->uuid, cmp->len)) > - goto no_match; > - > + if (!part->info || > + strncasecmp(cmp->uuid, part->info->uuid, cmp->len)) > + return 0; > return 1; > -no_match: > - return 0; > } > > /** > @@ -174,10 +169,9 @@ static int match_dev_by_label(struct device *dev, const void *data) > const char *label = data; > struct hd_struct *part = dev_to_part(dev); > > - if (part->info && !strcmp(label, part->info->volname)) > - return 1; > - > - return 0; > + if (!part->info || strcmp(label, part->info->volname)) > + return 0; > + return 1; > } > > static dev_t devt_from_partlabel(const char *label) > -- > 2.29.2 > -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel
