7795 loader: gcc6 build warnings

Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Alexander Pyhalov <apyhalov@gmail.com> Approved by: Robert Mustacchi <rm@joyent.com>
illumos · Jan 23, 2017 · 6a81003 · 6a81003
1 parent b93266d
commit 6a81003
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c
@@ -89,7 +89,6 @@ static const unsigned char flags[NOPT] = {
 };
 uint32_t opts;
 
-static const char *const dev_nm[NDEV] = {"ad", "da", "fd"};
 static const unsigned char dev_maj[NDEV] = {30, 4, 2};
 
 static struct i386_devdesc *bdev;

diff --git a/usr/src/boot/sys/boot/zfs/zfs.c b/usr/src/boot/sys/boot/zfs/zfs.c
@@ -691,16 +691,18 @@ zfs_bootfs(void *zdev)
 		STAILQ_FOREACH(kid, &vdev->v_children, v_childlink) {
 			/* use this kid? */
 			if (kid->v_state == VDEV_STATE_HEALTHY &&
-			    kid->v_phys_path != NULL);
+			    kid->v_phys_path != NULL) {
 				break;
+			}
 		}
 		if (kid != NULL) {
 			vdev = kid;
 			break;
 		}
 		if (vdev->v_state == VDEV_STATE_HEALTHY &&
-		    vdev->v_phys_path != NULL);
+		    vdev->v_phys_path != NULL) {
 			break;
+		}
 	}
 
 	/*