| g_label.c (197898) | g_label.c (199875) |
|---|---|
| 1/*- 2 * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org> 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-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org> 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/label/g_label.c 197898 2009-10-09 09:42:22Z pjd $"); | 28__FBSDID("$FreeBSD: head/sys/geom/label/g_label.c 199875 2009-11-28 11:57:43Z trasz $"); |
| 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/bio.h> | 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/bio.h> |
| 37#include <sys/sysctl.h> | |
| 38#include <sys/malloc.h> 39#include <sys/libkern.h> 40#include <geom/geom.h> 41#include <geom/geom_slice.h> 42#include <geom/label/g_label.h> 43 44 45SYSCTL_DECL(_kern_geom); --- 265 unchanged lines hidden (view full) --- 311 break; 312 313 g_label_create(NULL, mp, pp, md.md_label, G_LABEL_DIR, 314 pp->mediasize - pp->sectorsize); 315 } while (0); 316 for (i = 0; g_labels[i] != NULL; i++) { 317 char label[64]; 318 | 37#include <sys/malloc.h> 38#include <sys/libkern.h> 39#include <geom/geom.h> 40#include <geom/geom_slice.h> 41#include <geom/label/g_label.h> 42 43 44SYSCTL_DECL(_kern_geom); --- 265 unchanged lines hidden (view full) --- 310 break; 311 312 g_label_create(NULL, mp, pp, md.md_label, G_LABEL_DIR, 313 pp->mediasize - pp->sectorsize); 314 } while (0); 315 for (i = 0; g_labels[i] != NULL; i++) { 316 char label[64]; 317 |
| 318 if (g_labels[i]->ld_enabled == 0) 319 continue; |
|
| 319 g_topology_unlock(); 320 g_labels[i]->ld_taste(cp, label, sizeof(label)); 321 g_topology_lock(); 322 if (label[0] == '\0') 323 continue; 324 g_label_create(NULL, mp, pp, label, g_labels[i]->ld_dir, 325 pp->mediasize); 326 } --- 167 unchanged lines hidden --- | 320 g_topology_unlock(); 321 g_labels[i]->ld_taste(cp, label, sizeof(label)); 322 g_topology_lock(); 323 if (label[0] == '\0') 324 continue; 325 g_label_create(NULL, mp, pp, label, g_labels[i]->ld_dir, 326 pp->mediasize); 327 } --- 167 unchanged lines hidden --- |