summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-12-19 01:13:41 +0000
committermav <mav@FreeBSD.org>2014-12-19 01:13:41 +0000
commiteac5956a91676b1404b6076db57f80d70eaef17e (patch)
treee8dee59a385f07f7c3ebb5e0737434eb7ca97e89
parent3f663b8b407d2e2a58343fae3f875fea4e84fcff (diff)
downloadFreeBSD-src-eac5956a91676b1404b6076db57f80d70eaef17e.zip
FreeBSD-src-eac5956a91676b1404b6076db57f80d70eaef17e.tar.gz
MFC r275503:
Avoid unneeded malloc/memcpy/free if there is no metadata on disk. Submitted by: Dmitry Luhtionov <dmitryluhtionov@gmail.com>
-rw-r--r--sys/geom/raid/md_nvidia.c11
-rw-r--r--sys/geom/raid/md_sii.c11
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/geom/raid/md_nvidia.c b/sys/geom/raid/md_nvidia.c
index eb2e493..9a8397c 100644
--- a/sys/geom/raid/md_nvidia.c
+++ b/sys/geom/raid/md_nvidia.c
@@ -256,23 +256,24 @@ nvidia_meta_read(struct g_consumer *cp)
pp->name, error);
return (NULL);
}
- meta = malloc(sizeof(*meta), M_MD_NVIDIA, M_WAITOK);
- memcpy(meta, buf, min(sizeof(*meta), pp->sectorsize));
- g_free(buf);
+ meta = (struct nvidia_raid_conf *)buf;
/* Check if this is an NVIDIA RAID struct */
if (strncmp(meta->nvidia_id, NVIDIA_MAGIC, strlen(NVIDIA_MAGIC))) {
G_RAID_DEBUG(1, "NVIDIA signature check failed on %s", pp->name);
- free(meta, M_MD_NVIDIA);
+ g_free(buf);
return (NULL);
}
if (meta->config_size > 128 ||
meta->config_size < 30) {
G_RAID_DEBUG(1, "NVIDIA metadata size looks wrong: %d",
meta->config_size);
- free(meta, M_MD_NVIDIA);
+ g_free(buf);
return (NULL);
}
+ meta = malloc(sizeof(*meta), M_MD_NVIDIA, M_WAITOK);
+ memcpy(meta, buf, min(sizeof(*meta), pp->sectorsize));
+ g_free(buf);
/* Check metadata checksum. */
for (checksum = 0, ptr = (uint32_t *)meta,
diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c
index 5012dc5..8a982a6 100644
--- a/sys/geom/raid/md_sii.c
+++ b/sys/geom/raid/md_sii.c
@@ -277,15 +277,13 @@ sii_meta_read(struct g_consumer *cp)
pp->name, error);
return (NULL);
}
- meta = malloc(sizeof(*meta), M_MD_SII, M_WAITOK);
- memcpy(meta, buf, min(sizeof(*meta), pp->sectorsize));
- g_free(buf);
+ meta = (struct sii_raid_conf *)buf;
/* Check vendor ID. */
if (meta->vendor_id != 0x1095) {
G_RAID_DEBUG(1, "SiI vendor ID check failed on %s (0x%04x)",
pp->name, meta->vendor_id);
- free(meta, M_MD_SII);
+ g_free(buf);
return (NULL);
}
@@ -293,9 +291,12 @@ sii_meta_read(struct g_consumer *cp)
if (meta->version_major != 2) {
G_RAID_DEBUG(1, "SiI version check failed on %s (%d.%d)",
pp->name, meta->version_major, meta->version_minor);
- free(meta, M_MD_SII);
+ g_free(buf);
return (NULL);
}
+ meta = malloc(sizeof(*meta), M_MD_SII, M_WAITOK);
+ memcpy(meta, buf, min(sizeof(*meta), pp->sectorsize));
+ g_free(buf);
/* Check metadata checksum. */
for (checksum = 0, ptr = (uint16_t *)meta, i = 0; i <= 159; i++)
OpenPOWER on IntegriCloud