Deleted Added
full compact
g_label.c (241706) g_label.c (243333)
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 241706 2012-10-18 22:18:11Z attilio $");
28__FBSDID("$FreeBSD: head/sys/geom/label/g_label.c 243333 2012-11-20 12:32:18Z jh $");
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>

--- 145 unchanged lines hidden (view full) ---

182 if (req != NULL)
183 gctl_error(req, "Cannot create slice %s.", label);
184 return (NULL);
185 }
186 gp->orphan = g_label_orphan;
187 gp->spoiled = g_label_spoiled;
188 g_access(cp, -1, 0, 0);
189 g_slice_config(gp, 0, G_SLICE_CONFIG_SET, (off_t)0, mediasize,
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>

--- 145 unchanged lines hidden (view full) ---

182 if (req != NULL)
183 gctl_error(req, "Cannot create slice %s.", label);
184 return (NULL);
185 }
186 gp->orphan = g_label_orphan;
187 gp->spoiled = g_label_spoiled;
188 g_access(cp, -1, 0, 0);
189 g_slice_config(gp, 0, G_SLICE_CONFIG_SET, (off_t)0, mediasize,
190 pp->sectorsize, name);
190 pp->sectorsize, "%s", name);
191 G_LABEL_DEBUG(1, "Label for provider %s is %s.", pp->name, name);
192 return (gp);
193}
194
195static int
196g_label_destroy(struct g_geom *gp, boolean_t force)
197{
198 struct g_provider *pp;

--- 300 unchanged lines hidden ---
191 G_LABEL_DEBUG(1, "Label for provider %s is %s.", pp->name, name);
192 return (gp);
193}
194
195static int
196g_label_destroy(struct g_geom *gp, boolean_t force)
197{
198 struct g_provider *pp;

--- 300 unchanged lines hidden ---