PERFORCE change 122486 for review
Ulf Lilleengen
lulf at FreeBSD.org
Thu Jun 28 13:01:46 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122486
Change 122486 by lulf at lulf_carrot on 2007/06/28 13:00:56
- Style(9) changes.
- Add comment.
Affected files ...
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 edit
Differences ...
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 (text+ko) ====
@@ -148,8 +148,6 @@
g_detach(cp);
g_destroy_consumer(cp);
g_topology_unlock();
-
- return;
}
/*
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 (text+ko) ====
@@ -109,12 +109,14 @@
d = cursd->drive_sc;
+ /* XXX: Can't do a move without unmounting. Perhaps okay. */
if (gv_consumer_is_open(d->consumer) ||
gv_consumer_is_open(destination->consumer)) {
printf("VINUM: consumers on current and destination drive "
- " still open");
+ " still open\n");
return (GV_ERR_ISOPEN);
}
+
if (!(flags && GV_FLAG_F)) {
printf("VINUM: -f flag not passed; move would be "
"destructive\n");
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 (text+ko) ====
@@ -217,8 +217,6 @@
g_orphan_provider(pp, ENXIO);
g_topology_unlock();
}
-
- return;
}
/* Remove a plex. */
@@ -256,8 +254,6 @@
}
g_free(p);
-
- return;
}
/* Remove a subdisk. */
@@ -290,8 +286,6 @@
LIST_REMOVE(s, sd);
gv_free_sd(s);
g_free(s);
-
- return;
}
/* Remove a drive. */
@@ -357,6 +351,4 @@
g_free(d);
gv_save_config(sc);
-
- return;
}
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 (text+ko) ====
@@ -227,8 +227,6 @@
sbuf_printf(sb, " state %s", gv_sdstate(s->state));
sbuf_printf(sb, "\n");
}
-
- return;
}
static off_t
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 (text+ko) ====
@@ -115,8 +115,6 @@
}
break;
}
-
- return;
}
void
More information about the p4-projects
mailing list