| geom_vinum_drive.c (133318) | geom_vinum_drive.c (133449) |
|---|---|
| 1/*- 2 * Copyright (c) 2004 Lukas Ertl 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004 Lukas Ertl 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/geom/vinum/geom_vinum_drive.c 133318 2004-08-08 07:57:53Z phk $"); | 28__FBSDID("$FreeBSD: head/sys/geom/vinum/geom_vinum_drive.c 133449 2004-08-10 20:15:12Z le $"); |
| 29 30#include <sys/param.h> 31#include <sys/bio.h> 32#include <sys/errno.h> 33#include <sys/conf.h> 34#include <sys/kernel.h> 35#include <sys/kthread.h> 36#include <sys/libkern.h> --- 325 unchanged lines hidden (view full) --- 362 * taste, so parse the configuration here too, just to be on 363 * the safe side. 364 */ 365 buf = g_read_data(cp, GV_CFG_OFFSET, GV_CFG_LEN, &error); 366 if (buf == NULL || error != 0) { 367 g_free(vhdr); 368 break; 369 } | 29 30#include <sys/param.h> 31#include <sys/bio.h> 32#include <sys/errno.h> 33#include <sys/conf.h> 34#include <sys/kernel.h> 35#include <sys/kthread.h> 36#include <sys/libkern.h> --- 325 unchanged lines hidden (view full) --- 362 * taste, so parse the configuration here too, just to be on 363 * the safe side. 364 */ 365 buf = g_read_data(cp, GV_CFG_OFFSET, GV_CFG_LEN, &error); 366 if (buf == NULL || error != 0) { 367 g_free(vhdr); 368 break; 369 } |
| 370 g_topology_lock(); |
|
| 370 gv_parse_config(sc, buf, 1); 371 g_free(buf); 372 | 371 gv_parse_config(sc, buf, 1); 372 g_free(buf); 373 |
| 373 g_topology_lock(); | |
| 374 g_access(cp, -1, 0, 0); 375 g_detach(cp); 376 g_wither_geom(gp, ENXIO); 377 gp = NULL; 378 379 d = gv_find_drive(sc, vhdr->label.name); 380 381 /* We already know about this drive. */ --- 139 unchanged lines hidden --- | 374 g_access(cp, -1, 0, 0); 375 g_detach(cp); 376 g_wither_geom(gp, ENXIO); 377 gp = NULL; 378 379 d = gv_find_drive(sc, vhdr->label.name); 380 381 /* We already know about this drive. */ --- 139 unchanged lines hidden --- |