svn commit: r279878 - stable/10/sys/geom/raid

[Alexander Motin]

Author: mav
Date: Wed Mar 11 09:50:31 2015
New Revision: 279878
URL: https://svnweb.freebsd.org/changeset/base/279878

Log:
  MFC r279278: Replace constant with proper sizeof().
  
  Submitted by:	Dmitry Luhtionov <dmitryluhtionov at gmail.com>

Modified:
  stable/10/sys/geom/raid/md_intel.c
  stable/10/sys/geom/raid/md_jmicron.c
  stable/10/sys/geom/raid/md_nvidia.c
  stable/10/sys/geom/raid/md_promise.c
  stable/10/sys/geom/raid/md_sii.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/raid/md_intel.c
==============================================================================
--- stable/10/sys/geom/raid/md_intel.c	Wed Mar 11 09:49:06 2015	(r279877)
+++ stable/10/sys/geom/raid/md_intel.c	Wed Mar 11 09:50:31 2015	(r279878)
@@ -1487,7 +1487,6 @@ g_raid_md_taste_intel(struct g_raid_md_o
 
 	/* 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_o
 		    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);

Modified: stable/10/sys/geom/raid/md_jmicron.c
==============================================================================
--- stable/10/sys/geom/raid/md_jmicron.c	Wed Mar 11 09:49:06 2015	(r279877)
+++ stable/10/sys/geom/raid/md_jmicron.c	Wed Mar 11 09:50:31 2015	(r279878)
@@ -836,9 +836,9 @@ g_raid_md_taste_jmicron(struct g_raid_md
 
 	/* 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);

Modified: stable/10/sys/geom/raid/md_nvidia.c
==============================================================================
--- stable/10/sys/geom/raid/md_nvidia.c	Wed Mar 11 09:49:06 2015	(r279877)
+++ stable/10/sys/geom/raid/md_nvidia.c	Wed Mar 11 09:50:31 2015	(r279878)
@@ -841,9 +841,9 @@ g_raid_md_taste_nvidia(struct g_raid_md_
 
 	/* 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);

Modified: stable/10/sys/geom/raid/md_promise.c
==============================================================================
--- stable/10/sys/geom/raid/md_promise.c	Wed Mar 11 09:49:06 2015	(r279877)
+++ stable/10/sys/geom/raid/md_promise.c	Wed Mar 11 09:50:31 2015	(r279878)
@@ -1105,9 +1105,9 @@ g_raid_md_taste_promise(struct g_raid_md
 
 	/* 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);

Modified: stable/10/sys/geom/raid/md_sii.c
==============================================================================
--- stable/10/sys/geom/raid/md_sii.c	Wed Mar 11 09:49:06 2015	(r279877)
+++ stable/10/sys/geom/raid/md_sii.c	Wed Mar 11 09:50:31 2015	(r279878)
@@ -923,9 +923,9 @@ g_raid_md_taste_sii(struct g_raid_md_obj
 
 	/* 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);