svn commit: r220208 - projects/graid/head/sys/geom/raid
Alexander Motin
mav at FreeBSD.org
Thu Mar 31 15:52:12 UTC 2011
Author: mav
Date: Thu Mar 31 15:52:12 2011
New Revision: 220208
URL: http://svn.freebsd.org/changeset/base/220208
Log:
Remove unused assignments and variables.
Found with: Clang Static Analyzer
Modified:
projects/graid/head/sys/geom/raid/g_raid.c
projects/graid/head/sys/geom/raid/md_intel.c
projects/graid/head/sys/geom/raid/md_jmicron.c
projects/graid/head/sys/geom/raid/md_nvidia.c
projects/graid/head/sys/geom/raid/md_promise.c
projects/graid/head/sys/geom/raid/md_sii.c
Modified: projects/graid/head/sys/geom/raid/g_raid.c
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/g_raid.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -1608,7 +1608,7 @@ g_raid_access(struct g_provider *pp, int
{
struct g_raid_volume *vol;
struct g_raid_softc *sc;
- int dcr, dcw, dce, opens, error = 0;
+ int dcw, opens, error = 0;
g_topology_assert();
sc = pp->geom->softc;
@@ -1618,10 +1618,7 @@ g_raid_access(struct g_provider *pp, int
G_RAID_DEBUG1(2, sc, "Access request for %s: r%dw%de%d.", pp->name,
acr, acw, ace);
-
- dcr = pp->acr + acr;
dcw = pp->acw + acw;
- dce = pp->ace + ace;
g_topology_unlock();
sx_xlock(&sc->sc_lock);
Modified: projects/graid/head/sys/geom/raid/md_intel.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_intel.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/md_intel.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -1153,7 +1153,6 @@ g_raid_md_taste_intel(struct g_raid_md_o
/* Read metadata from device. */
meta = NULL;
- spare = 0;
vendor = 0xffff;
disk_pos = 0;
if (g_access(cp, 1, 0, 0) != 0)
Modified: projects/graid/head/sys/geom/raid/md_jmicron.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_jmicron.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/md_jmicron.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -831,9 +831,7 @@ g_raid_md_taste_jmicron(struct g_raid_md
/* Read metadata from device. */
meta = NULL;
- spare = 0;
vendor = 0xffff;
- disk_pos = 0;
if (g_access(cp, 1, 0, 0) != 0)
return (G_RAID_MD_TASTE_FAIL);
g_topology_unlock();
Modified: projects/graid/head/sys/geom/raid/md_nvidia.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_nvidia.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/md_nvidia.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -824,7 +824,7 @@ g_raid_md_taste_nvidia(struct g_raid_md_
struct nvidia_raid_conf *meta;
struct g_raid_md_nvidia_perdisk *pd;
struct g_geom *geom;
- int error, disk_pos, result, spare, len;
+ int error, result, spare, len;
char name[32];
uint16_t vendor;
@@ -834,9 +834,7 @@ g_raid_md_taste_nvidia(struct g_raid_md_
/* Read metadata from device. */
meta = NULL;
- spare = 0;
vendor = 0xffff;
- disk_pos = 0;
if (g_access(cp, 1, 0, 0) != 0)
return (G_RAID_MD_TASTE_FAIL);
g_topology_unlock();
@@ -862,16 +860,9 @@ g_raid_md_taste_nvidia(struct g_raid_md_
return (G_RAID_MD_TASTE_FAIL);
}
- /* Check this disk position in obtained metadata. */
- disk_pos = meta->disk_number;
- if (disk_pos == -1) {
- G_RAID_DEBUG(1, "NVIDIA disk position not found");
- goto fail1;
- }
-
/* Metadata valid. Print it. */
g_raid_md_nvidia_print(meta);
- G_RAID_DEBUG(1, "NVIDIA disk position %d", disk_pos);
+ G_RAID_DEBUG(1, "NVIDIA disk position %d", meta->disk_number);
spare = 0;//(meta->type == NVIDIA_T_SPARE) ? 1 : 0;
search:
Modified: projects/graid/head/sys/geom/raid/md_promise.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_promise.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/md_promise.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -1154,12 +1154,10 @@ g_raid_md_event_promise(struct g_raid_md
struct g_raid_disk *disk, u_int event)
{
struct g_raid_softc *sc;
- struct g_raid_md_promise_perdisk *pd;
sc = md->mdo_softc;
if (disk == NULL)
return (-1);
- pd = (struct g_raid_md_promise_perdisk *)disk->d_md_data;
switch (event) {
case G_RAID_DISK_E_DISCONNECTED:
/* Delete disk. */
Modified: projects/graid/head/sys/geom/raid/md_sii.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_sii.c Thu Mar 31 15:27:03 2011 (r220207)
+++ projects/graid/head/sys/geom/raid/md_sii.c Thu Mar 31 15:52:12 2011 (r220208)
@@ -917,9 +917,7 @@ g_raid_md_taste_sii(struct g_raid_md_obj
/* Read metadata from device. */
meta = NULL;
- spare = 0;
vendor = 0xffff;
- disk_pos = 0;
if (g_access(cp, 1, 0, 0) != 0)
return (G_RAID_MD_TASTE_FAIL);
g_topology_unlock();
More information about the svn-src-projects
mailing list