svn commit: r220202 - projects/graid/head/sys/geom/raid
Alexander Motin
mav at FreeBSD.org
Thu Mar 31 14:44:00 UTC 2011
Author: mav
Date: Thu Mar 31 14:44:00 2011
New Revision: 220202
URL: http://svn.freebsd.org/changeset/base/220202
Log:
Remove unused assignments and variables.
Found with: Clang Static Analyzer
Modified:
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
projects/graid/head/sys/geom/raid/tr_raid1.c
projects/graid/head/sys/geom/raid/tr_raid1e.c
Modified: projects/graid/head/sys/geom/raid/md_jmicron.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_jmicron.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/md_jmicron.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -579,14 +579,12 @@ g_raid_md_jmicron_refill(struct g_raid_s
{
struct g_raid_md_object *md;
struct g_raid_md_jmicron_object *mdi;
- struct jmicron_raid_conf *meta;
struct g_raid_disk *disk;
struct task *task;
int update, na;
md = sc->sc_md;
mdi = (struct g_raid_md_jmicron_object *)md;
- meta = mdi->mdio_meta;
update = 0;
do {
/* Make sure we miss anything. */
@@ -620,10 +618,8 @@ g_raid_md_jmicron_refill(struct g_raid_s
} while (disk != NULL);
/* Write new metadata if we changed something. */
- if (update) {
+ if (update)
g_raid_md_write_jmicron(md, NULL, NULL, NULL);
- meta = mdi->mdio_meta;
- }
/* Update status of our need for spare. */
mdi->mdio_incomplete = (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) <
@@ -1469,7 +1465,6 @@ g_raid_md_write_jmicron(struct g_raid_md
if (mdi->mdio_meta != NULL)
free(mdi->mdio_meta, M_MD_JMICRON);
mdi->mdio_meta = meta;
- i = 0;
TAILQ_FOREACH(disk, &sc->sc_disks, d_next) {
pd = (struct g_raid_md_jmicron_perdisk *)disk->d_md_data;
if (disk->d_state != G_RAID_DISK_S_ACTIVE &&
@@ -1506,12 +1501,10 @@ g_raid_md_fail_disk_jmicron(struct g_rai
struct g_raid_subdisk *tsd, struct g_raid_disk *tdisk)
{
struct g_raid_softc *sc;
- struct g_raid_md_jmicron_object *mdi;
struct g_raid_md_jmicron_perdisk *pd;
struct g_raid_subdisk *sd;
sc = md->mdo_softc;
- mdi = (struct g_raid_md_jmicron_object *)md;
pd = (struct g_raid_md_jmicron_perdisk *)tdisk->d_md_data;
/* We can't fail disk that is not a part of array now. */
Modified: projects/graid/head/sys/geom/raid/md_nvidia.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_nvidia.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/md_nvidia.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -584,14 +584,12 @@ g_raid_md_nvidia_refill(struct g_raid_so
{
struct g_raid_md_object *md;
struct g_raid_md_nvidia_object *mdi;
- struct nvidia_raid_conf *meta;
struct g_raid_disk *disk;
struct task *task;
int update, na;
md = sc->sc_md;
mdi = (struct g_raid_md_nvidia_object *)md;
- meta = mdi->mdio_meta;
update = 0;
do {
/* Make sure we miss anything. */
@@ -625,10 +623,8 @@ g_raid_md_nvidia_refill(struct g_raid_so
} while (disk != NULL);
/* Write new metadata if we changed something. */
- if (update) {
+ if (update)
g_raid_md_write_nvidia(md, NULL, NULL, NULL);
- meta = mdi->mdio_meta;
- }
/* Update status of our need for spare. */
mdi->mdio_incomplete = (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) <
@@ -1527,12 +1523,10 @@ g_raid_md_fail_disk_nvidia(struct g_raid
struct g_raid_subdisk *tsd, struct g_raid_disk *tdisk)
{
struct g_raid_softc *sc;
- struct g_raid_md_nvidia_object *mdi;
struct g_raid_md_nvidia_perdisk *pd;
struct g_raid_subdisk *sd;
sc = md->mdo_softc;
- mdi = (struct g_raid_md_nvidia_object *)md;
pd = (struct g_raid_md_nvidia_perdisk *)tdisk->d_md_data;
/* We can't fail disk that is not a part of array now. */
Modified: projects/graid/head/sys/geom/raid/md_promise.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_promise.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/md_promise.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -1184,10 +1184,8 @@ static int
g_raid_md_volume_event_promise(struct g_raid_md_object *md,
struct g_raid_volume *vol, u_int event)
{
- struct g_raid_softc *sc;
struct g_raid_md_promise_pervolume *pv;
- sc = md->mdo_softc;
pv = (struct g_raid_md_promise_pervolume *)vol->v_md_data;
switch (event) {
case G_RAID_VOLUME_E_STARTMD:
@@ -1567,8 +1565,6 @@ g_raid_md_ctl_promise(struct g_raid_md_o
continue;
}
- pd = (struct g_raid_md_promise_perdisk *)disk->d_md_data;
-
/* Erase metadata on deleting disk and destroy it. */
promise_meta_erase(disk->d_consumer);
g_raid_destroy_disk(disk);
@@ -1610,7 +1606,6 @@ g_raid_md_ctl_promise(struct g_raid_md_o
error = -4;
break;
}
- pp = cp->provider;
g_topology_unlock();
pd = malloc(sizeof(*pd), M_MD_PROMISE, M_WAITOK | M_ZERO);
Modified: projects/graid/head/sys/geom/raid/md_sii.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_sii.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/md_sii.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -641,14 +641,12 @@ g_raid_md_sii_refill(struct g_raid_softc
{
struct g_raid_md_object *md;
struct g_raid_md_sii_object *mdi;
- struct sii_raid_conf *meta;
struct g_raid_disk *disk;
struct task *task;
int update, na;
md = sc->sc_md;
mdi = (struct g_raid_md_sii_object *)md;
- meta = mdi->mdio_meta;
update = 0;
do {
/* Make sure we miss anything. */
@@ -682,10 +680,8 @@ g_raid_md_sii_refill(struct g_raid_softc
} while (disk != NULL);
/* Write new metadata if we changed something. */
- if (update) {
+ if (update)
g_raid_md_write_sii(md, NULL, NULL, NULL);
- meta = mdi->mdio_meta;
- }
/* Update status of our need for spare. */
mdi->mdio_incomplete = (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) <
@@ -1558,7 +1554,6 @@ g_raid_md_write_sii(struct g_raid_md_obj
if (mdi->mdio_meta != NULL)
free(mdi->mdio_meta, M_MD_SII);
mdi->mdio_meta = meta;
- i = 0;
TAILQ_FOREACH(disk, &sc->sc_disks, d_next) {
pd = (struct g_raid_md_sii_perdisk *)disk->d_md_data;
if (disk->d_state != G_RAID_DISK_S_ACTIVE)
@@ -1604,12 +1599,10 @@ g_raid_md_fail_disk_sii(struct g_raid_md
struct g_raid_subdisk *tsd, struct g_raid_disk *tdisk)
{
struct g_raid_softc *sc;
- struct g_raid_md_sii_object *mdi;
struct g_raid_md_sii_perdisk *pd;
struct g_raid_subdisk *sd;
sc = md->mdo_softc;
- mdi = (struct g_raid_md_sii_object *)md;
pd = (struct g_raid_md_sii_perdisk *)tdisk->d_md_data;
/* We can't fail disk that is not a part of array now. */
Modified: projects/graid/head/sys/geom/raid/tr_raid1.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid1.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -549,7 +549,6 @@ g_raid_tr_iostart_raid1_read(struct g_ra
static void
g_raid_tr_iostart_raid1_write(struct g_raid_tr_object *tr, struct bio *bp)
{
- struct g_raid_softc *sc;
struct g_raid_volume *vol;
struct g_raid_subdisk *sd;
struct bio_queue_head queue;
@@ -557,7 +556,6 @@ g_raid_tr_iostart_raid1_write(struct g_r
int i;
vol = tr->tro_volume;
- sc = vol->v_softc;
/*
* Allocate all bios before sending any request, so we can return
Modified: projects/graid/head/sys/geom/raid/tr_raid1e.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid1e.c Thu Mar 31 14:35:33 2011 (r220201)
+++ projects/graid/head/sys/geom/raid/tr_raid1e.c Thu Mar 31 14:44:00 2011 (r220202)
@@ -196,13 +196,11 @@ g_raid_tr_taste_raid1e(struct g_raid_tr_
static int
g_raid_tr_update_state_raid1e_even(struct g_raid_volume *vol)
{
- struct g_raid_tr_raid1e_object *trs;
struct g_raid_softc *sc;
struct g_raid_subdisk *sd, *bestsd, *worstsd;
int i, j, state, sstate;
sc = vol->v_softc;
- trs = (struct g_raid_tr_raid1e_object *)vol->v_tr;
state = G_RAID_VOLUME_S_OPTIMAL;
for (i = 0; i < vol->v_disks_count / N; i++) {
bestsd = &vol->v_subdisks[i * N];
@@ -251,13 +249,11 @@ g_raid_tr_update_state_raid1e_even(struc
static int
g_raid_tr_update_state_raid1e_odd(struct g_raid_volume *vol)
{
- struct g_raid_tr_raid1e_object *trs;
struct g_raid_softc *sc;
struct g_raid_subdisk *sd, *bestsd, *worstsd;
int i, j, state, sstate;
sc = vol->v_softc;
- trs = (struct g_raid_tr_raid1e_object *)vol->v_tr;
if (g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_ACTIVE) ==
vol->v_disks_count)
return (G_RAID_VOLUME_S_OPTIMAL);
More information about the svn-src-projects
mailing list