37c37
< __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 226735 2011-10-25 14:04:59Z pjd $");
---
> __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 226736 2011-10-25 14:05:39Z pjd $");
111a112
>
118a120
>
254,256c256,258
< if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) &&
< (sc = bp2->bio_to->geom->softc) &&
< (dp = sc->dp)) {
---
> if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0 &&
> (sc = bp2->bio_to->geom->softc) != NULL &&
> (dp = sc->dp) != NULL) {
285c287
< return(error);
---
> return (error);
548a551
>
638d640
<