From 0b1b7c2cecedeae66e2c15471f0f060782e08fa7 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Wed, 25 Feb 2015 10:18:11 +0000 Subject: [PATCH] Replace constant with proper sizeof(). Submitted by: Dmitry Luhtionov MFC after: 2 weeks --- sys/geom/raid/md_intel.c | 4 ++-- sys/geom/raid/md_jmicron.c | 4 ++-- sys/geom/raid/md_nvidia.c | 4 ++-- sys/geom/raid/md_promise.c | 4 ++-- sys/geom/raid/md_sii.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/geom/raid/md_intel.c b/sys/geom/raid/md_intel.c index 3ec904c9938..9d6e4444878 100644 --- a/sys/geom/raid/md_intel.c +++ b/sys/geom/raid/md_intel.c @@ -1487,7 +1487,6 @@ g_raid_md_taste_intel(struct g_raid_md_object *md, struct g_class *mp, /* Read metadata from device. */ meta = NULL; - vendor = 0xffff; disk_pos = 0; g_topology_unlock(); error = g_raid_md_get_label(cp, serial, sizeof(serial)); @@ -1496,7 +1495,8 @@ g_raid_md_taste_intel(struct g_raid_md_object *md, struct g_class *mp, pp->name, error); goto fail2; } - len = 2; + vendor = 0xffff; + len = sizeof(vendor); if (pp->geom->rank == 1) g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); meta = intel_meta_read(cp); diff --git a/sys/geom/raid/md_jmicron.c b/sys/geom/raid/md_jmicron.c index d4748e068b6..9bd64d22da9 100644 --- a/sys/geom/raid/md_jmicron.c +++ b/sys/geom/raid/md_jmicron.c @@ -836,9 +836,9 @@ g_raid_md_taste_jmicron(struct g_raid_md_object *md, struct g_class *mp, /* Read metadata from device. */ meta = NULL; - vendor = 0xffff; g_topology_unlock(); - len = 2; + vendor = 0xffff; + len = sizeof(vendor); if (pp->geom->rank == 1) g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); meta = jmicron_meta_read(cp); diff --git a/sys/geom/raid/md_nvidia.c b/sys/geom/raid/md_nvidia.c index 9a8397c9d0e..1c4fe5ee034 100644 --- a/sys/geom/raid/md_nvidia.c +++ b/sys/geom/raid/md_nvidia.c @@ -841,9 +841,9 @@ g_raid_md_taste_nvidia(struct g_raid_md_object *md, struct g_class *mp, /* Read metadata from device. */ meta = NULL; - vendor = 0xffff; g_topology_unlock(); - len = 2; + vendor = 0xffff; + len = sizeof(vendor); if (pp->geom->rank == 1) g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); meta = nvidia_meta_read(cp); diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index 73a2520be12..2d161e70136 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1105,9 +1105,9 @@ g_raid_md_taste_promise(struct g_raid_md_object *md, struct g_class *mp, /* Read metadata from device. */ meta = NULL; - vendor = 0xffff; g_topology_unlock(); - len = 2; + vendor = 0xffff; + len = sizeof(vendor); if (pp->geom->rank == 1) g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); subdisks = promise_meta_read(cp, metaarr); diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c index 8a982a6dadb..83703459541 100644 --- a/sys/geom/raid/md_sii.c +++ b/sys/geom/raid/md_sii.c @@ -923,9 +923,9 @@ g_raid_md_taste_sii(struct g_raid_md_object *md, struct g_class *mp, /* Read metadata from device. */ meta = NULL; - vendor = 0xffff; g_topology_unlock(); - len = 2; + vendor = 0xffff; + len = sizeof(vendor); if (pp->geom->rank == 1) g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); meta = sii_meta_read(cp);