d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Check flag with the bitwise operator, not the logical operator.

Browse Source 
Submitted by:	arundel
MFC after:	1 week
This commit is contained in:
Ulf Lilleengen 2010-10-01 06:12:13 +00:00
parent c535eb59d1
commit de02b15928
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/vinum/geom_vinum_move.c
View File

@ -115,13 +115,13 @@ gv_move_sd(struct gv_softc *sc, struct gv_sd *cursd,
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);

4
sys/geom/vinum/geom_vinum_rename.c
View File

@ -173,7 +173,7 @@ gv_rename_plex(struct gv_softc *sc, struct gv_plex *p, char *newname, int flags)
/* 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, struct gv_volume *v, char *newname,
/* 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.