Deleted Added
full compact
g_part.c (200539) g_part.c (201645)
1/*-
2 * Copyright (c) 2002, 2005-2009 Marcel Moolenaar
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 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002, 2005-2009 Marcel Moolenaar
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 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/geom/part/g_part.c 200539 2009-12-14 20:26:27Z rpaulo $");
28__FBSDID("$FreeBSD: head/sys/geom/part/g_part.c 201645 2010-01-06 13:14:37Z mav $");
29
30#include <sys/param.h>
31#include <sys/bio.h>
32#include <sys/diskmbr.h>
33#include <sys/endian.h>
34#include <sys/kernel.h>
35#include <sys/kobj.h>
36#include <sys/limits.h>

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

283 entry->gpe_pp->private = entry; /* Close the circle. */
284 }
285 entry->gpe_pp->index = entry->gpe_index - 1; /* index is 1-based. */
286 entry->gpe_pp->mediasize = (entry->gpe_end - entry->gpe_start + 1) *
287 pp->sectorsize;
288 entry->gpe_pp->mediasize -= entry->gpe_offset - offset;
289 entry->gpe_pp->sectorsize = pp->sectorsize;
290 entry->gpe_pp->flags = pp->flags & G_PF_CANDELETE;
29
30#include <sys/param.h>
31#include <sys/bio.h>
32#include <sys/diskmbr.h>
33#include <sys/endian.h>
34#include <sys/kernel.h>
35#include <sys/kobj.h>
36#include <sys/limits.h>

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

283 entry->gpe_pp->private = entry; /* Close the circle. */
284 }
285 entry->gpe_pp->index = entry->gpe_index - 1; /* index is 1-based. */
286 entry->gpe_pp->mediasize = (entry->gpe_end - entry->gpe_start + 1) *
287 pp->sectorsize;
288 entry->gpe_pp->mediasize -= entry->gpe_offset - offset;
289 entry->gpe_pp->sectorsize = pp->sectorsize;
290 entry->gpe_pp->flags = pp->flags & G_PF_CANDELETE;
291 if (pp->stripesize > 0) {
292 entry->gpe_pp->stripesize = pp->stripesize;
293 entry->gpe_pp->stripeoffset = (pp->stripeoffset +
294 entry->gpe_offset) % pp->stripesize;
295 }
291 entry->gpe_pp->stripesize = pp->stripesize;
292 entry->gpe_pp->stripeoffset = pp->stripeoffset + entry->gpe_offset;
293 if (pp->stripesize > 0)
294 entry->gpe_pp->stripeoffset %= pp->stripesize;
296 g_error_provider(entry->gpe_pp, 0);
297}
298
299static int
300g_part_parm_geom(const char *rawname, struct g_geom **v)
301{
302 struct g_geom *gp;
303 const char *pname;

--- 1539 unchanged lines hidden ---
295 g_error_provider(entry->gpe_pp, 0);
296}
297
298static int
299g_part_parm_geom(const char *rawname, struct g_geom **v)
300{
301 struct g_geom *gp;
302 const char *pname;

--- 1539 unchanged lines hidden ---