redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

init: cleanup match_dev_by_uuid and match_dev_by_label 

Avoid a totally pointless goto label, and use the same style of
comparism for both helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
zero-sugar-mainline-defconfig
Christoph Hellwig 2020-11-14 19:41:48 +01:00 committed by Jens Axboe
parent e036bb8e0c
commit 013b0e96ae
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
init/do_mounts.c
View File

@ -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)