summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-11-14 19:41:48 +0100
committerJens Axboe <axboe@kernel.dk>2020-12-01 14:53:39 -0700
commit013b0e96ae2225a649b48a2f8fc4f87429483cb1 (patch)
tree35180d5e2c0ccea3893a9b93a74b1ca92df8d0a7
parente036bb8e0cdf9dbac3b76fb0a576100eaa81f0be (diff)
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>
-rw-r--r--init/do_mounts.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index afa26a4028d2..5879edf083b3 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)