| geom_dev.c (130585) | geom_dev.c (130640) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: head/sys/geom/geom_dev.c 130585 2004-06-16 09:47:26Z phk $"); | 37__FBSDID("$FreeBSD: head/sys/geom/geom_dev.c 130640 2004-06-17 17:16:53Z phk $"); |
| 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/malloc.h> 42#include <sys/kernel.h> 43#include <sys/conf.h> 44#include <sys/bio.h> 45#include <sys/lock.h> --- 52 unchanged lines hidden (view full) --- 98 * XXX: we no longer need it. Ideally, root-fs would be mounted through DEVFS 99 * XXX: eliminating the need for this hack. 100 */ 101static void 102g_dev_clone(void *arg __unused, char *name, int namelen __unused, struct cdev **dev) 103{ 104 struct g_geom *gp; 105 | 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/malloc.h> 42#include <sys/kernel.h> 43#include <sys/conf.h> 44#include <sys/bio.h> 45#include <sys/lock.h> --- 52 unchanged lines hidden (view full) --- 98 * XXX: we no longer need it. Ideally, root-fs would be mounted through DEVFS 99 * XXX: eliminating the need for this hack. 100 */ 101static void 102g_dev_clone(void *arg __unused, char *name, int namelen __unused, struct cdev **dev) 103{ 104 struct g_geom *gp; 105 |
| 106 if (*dev != NODEV) | 106 if (*dev != NULL) |
| 107 return; 108 109 g_waitidle(); 110 111 /* g_topology_lock(); */ 112 LIST_FOREACH(gp, &g_dev_class.geom, geom) { 113 if (strcmp(gp->name, name)) 114 continue; --- 331 unchanged lines hidden --- | 107 return; 108 109 g_waitidle(); 110 111 /* g_topology_lock(); */ 112 LIST_FOREACH(gp, &g_dev_class.geom, geom) { 113 if (strcmp(gp->name, name)) 114 continue; --- 331 unchanged lines hidden --- |