From a0f3ae4e0b7f448329a601b1f02247922b5c0c8a Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Thu, 11 May 2000 07:24:41 +0000
Subject: [PATCH] vinum_scandisk: Correct error recovery if a configuration is
 munged.

---
 sys/dev/vinum/vinumio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index efa76adab4b..8a55e2a7ff0 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.27 1999/12/31 02:49:14 grog Exp grog $
+ * $Id: vinumio.c,v 1.30 2000/05/10 23:23:30 grog Exp grog $
  * $FreeBSD$
  */
 
@@ -780,6 +780,7 @@ write_volume_label(int volno)
     error = bufwait(bp);
     bp->b_flags |= B_INVAL | B_AGE;
     bp->b_ioflags &= ~BIO_ERROR;
+
     brelse(bp);
     return error;
 }
@@ -794,7 +795,6 @@ vinum_scandisk(char *devicename[], int drives)
     volatile int gooddrives;				    /* number of usable drives found */
     int firsttime;					    /* set if we have never configured before */
     int error;
-    struct nameidata nd;				    /* mount point credentials */
     char *config_text;					    /* read the config info from disk into here */
     char *volatile cptr;				    /* pointer into config information */
     char *eptr;						    /* end pointer into config information */
@@ -936,7 +936,7 @@ vinum_scandisk(char *devicename[], int drives)
 			 */
 			log(LOG_ERR,
 			    "vinum: Config error on %s, aborting integration\n",
-			    nd.ni_dirp);
+			    drive->devicename);
 			free_drive(drive);		    /* give it back */
 			status = EINVAL;
 		    }