Author: lulf
Date: Fri Oct 1 06:12:13 2010
New Revision: 213318
URL: http://svn.freebsd.org/changeset/base/213318
Log:
- Check flag with the bitwise operator, not the logical operator.
Submitted by: arundel
MFC after: 1 week
Modified:
head/sys/geom/vinum/geom_vinum_move.c
head/sys/geom/vinum/geom_vinum_rename.c
Modified: head/sys/geom/vinum/geom_vinum_move.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_move.c Fri Oct 1 03:59:18 2010
(r213317)
+++ head/sys/geom/vinum/geom_vinum_move.c Fri Oct 1 06:12:13 2010
(r213318)
@@ -115,13 +115,13 @@ gv_move_sd(struct gv_softc *sc, struct g
if ((gv_consumer_is_open(d->consumer) ||
gv_consumer_is_open(destination->consumer)) &&
- !(flags && GV_FLAG_F)) {
+ !(flags & GV_FLAG_F)) {
G_VINUM_DEBUG(0, "consumers on current and destination drive "
" still open");
return (GV_ERR_ISBUSY);
}
- if (!(flags && GV_FLAG_F)) {
+ if (!(flags & GV_FLAG_F)) {
G_VINUM_DEBUG(1, "-f flag not passed; move would be "
"destructive");
return (GV_ERR_INVFLAG);
Modified: head/sys/geom/vinum/geom_vinum_rename.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_rename.c Fri Oct 1 03:59:18 2010
(r213317)
+++ head/sys/geom/vinum/geom_vinum_rename.c Fri Oct 1 06:12:13 2010
(r213318)
@@ -173,7 +173,7 @@ gv_rename_plex(struct gv_softc *sc, stru
/* Fix up references and potentially rename subdisks. */
LIST_FOREACH(s, &p->subdisks, in_plex) {
strlcpy(s->plex, p->name, sizeof(s->plex));
- if (flags && GV_FLAG_R) {
+ if (flags & GV_FLAG_R) {
/*
* Look for the two last dots in the string, and assume
* that the old value was ok.
@@ -243,7 +243,7 @@ gv_rename_vol(struct gv_softc *sc, struc
/* Fix up references and potentially rename plexes. */
LIST_FOREACH(p, &v->plexes, in_volume) {
strlcpy(p->volume, v->name, sizeof(p->volume));
- if (flags && GV_FLAG_R) {
+ if (flags & GV_FLAG_R) {
/*
* Look for the last dot in the string, and assume that
* the old value was ok.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
