From be05126e240997ef7c446163f0954a405daf39ac Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Sun, 15 Jun 2003 01:42:01 +0000
Subject: [PATCH] check_drive: If the partition isn't a Vinum drive, release it
 again and return NULL.

vinum_scandisk: Don't handle NULL device pointers.
	        Only look at compatibility partition for i386.  This
	        is a kludge which should go away once I have adequate
	        documentation for the New World Order.

Together, these fixes remove occasional error messages about
non-existent drives.  They may also fix a number of problems that have
been reported without a PR.

PRs: None
---
 sys/dev/vinum/vinumio.c | 70 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index ffa7d8838e14..7a655437ef5a 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -368,13 +368,12 @@ check_drive(char *devicename)
 		}
 	    }
 	}
-    } else {
-	if (drive->lasterror == 0)
-	    drive->lasterror = ENODEV;
+	return drive;
+    } else {						    /* not ours, */
 	close_drive(drive);
-	drive->state = drive_down;
+	free_drive(drive);				    /* get rid of it */
+	return NULL;
     }
-    return drive;
 }
 
 static char *
@@ -758,7 +757,6 @@ vinum_scandisk(char *devicename)
     for (cp = devicename; *cp; cp = ep) {
 	char part;					    /* UNIX partition */
 	int slice;
-	int founddrive;					    /* flag when we find a vinum drive */
 
 	while (*cp == ' ')
 	    cp++;					    /* find start of name */
@@ -777,7 +775,6 @@ vinum_scandisk(char *devicename)
 	np += ep - cp;					    /* and point past */
 
 	partnamelen = MAXPATHLEN + np - partname;	    /* remaining length in partition name */
-	founddrive = 0;					    /* no vinum drive found yet on this spindle */
 	/* first try the partition table */
 	for (slice = 1; slice < 5; slice++)
 	    for (part = 'a'; part < 'i'; part++) {
@@ -788,24 +785,27 @@ vinum_scandisk(char *devicename)
 			slice,
 			part);
 		    drive = check_drive(partname);	    /* try to open it */
-		    if ((drive->lasterror != 0)		    /* didn't work, */
-		    ||(drive->state < drive_down))
-			free_drive(drive);		    /* get rid of it */
-		    else if (drive->flags & VF_CONFIGURED)  /* already read this config, */
-			log(LOG_WARNING,
-			    "vinum: already read config from %s\n", /* say so */
-			    drive->label.name);
-		    else {
-			if (gooddrives == drives)	    /* ran out of entries */
-			    EXPAND(drivelist, int, drives, drives); /* double the size */
-			drivelist[gooddrives] = drive->driveno;	/* keep the drive index */
-			drive->flags &= ~VF_NEWBORN;	    /* which is no longer newly born */
-			gooddrives++;
-			founddrive++;
+		    if (drive) {			    /* got something, */
+			if (drive->flags & VF_CONFIGURED)   /* already read this config, */
+			    log(LOG_WARNING,
+				"vinum: already read config from %s\n",	/* say so */
+				drive->label.name);
+			else {
+			    if (gooddrives == drives)	    /* ran out of entries */
+				EXPAND(drivelist, int, drives, drives);	/* double the size */
+			    drivelist[gooddrives] = drive->driveno; /* keep the drive index */
+			    drive->flags &= ~VF_NEWBORN;    /* which is no longer newly born */
+			    gooddrives++;
+			}
 		    }
 		}
 	    }
-	if (founddrive == 0) {				    /* didn't find anything, */
+#ifdef __i386__
+	/*
+	 * This is a kludge.  Probably none of this
+	 * should be here.
+	 */
+	if (gooddrives == 0) {				    /* didn't find anything, */
 	    for (part = 'a'; part < 'i'; part++)	    /* try the compatibility partition */
 		if (part != 'c') {			    /* don't do the c partition */
 		    snprintf(np,
@@ -813,22 +813,22 @@ vinum_scandisk(char *devicename)
 			"%c",
 			part);
 		    drive = check_drive(partname);	    /* try to open it */
-		    if ((drive->lasterror != 0)		    /* didn't work, */
-		    ||(drive->state < drive_down))
-			free_drive(drive);		    /* get rid of it */
-		    else if (drive->flags & VF_CONFIGURED)  /* already read this config, */
-			log(LOG_WARNING,
-			    "vinum: already read config from %s\n", /* say so */
-			    drive->label.name);
-		    else {
-			if (gooddrives == drives)	    /* ran out of entries */
-			    EXPAND(drivelist, int, drives, drives); /* double the size */
-			drivelist[gooddrives] = drive->driveno;	/* keep the drive index */
-			drive->flags &= ~VF_NEWBORN;	    /* which is no longer newly born */
-			gooddrives++;
+		    if (drive) {			    /* got something, */
+			if (drive->flags & VF_CONFIGURED)   /* already read this config, */
+			    log(LOG_WARNING,
+				"vinum: already read config from %s\n",	/* say so */
+				drive->label.name);
+			else {
+			    if (gooddrives == drives)	    /* ran out of entries */
+				EXPAND(drivelist, int, drives, drives);	/* double the size */
+			    drivelist[gooddrives] = drive->driveno; /* keep the drive index */
+			    drive->flags &= ~VF_NEWBORN;    /* which is no longer newly born */
+			    gooddrives++;
+			}
 		    }
 		}
 	}
+#endif
     }
     Free(partname);