View | Details | Raw Unified | Return to bug 197766
Collapse All | Expand All

(-)sys/conf/options (+1 lines)
Lines 93-98 Link Here
93
GEOM_JOURNAL	opt_geom.h
93
GEOM_JOURNAL	opt_geom.h
94
GEOM_LABEL	opt_geom.h
94
GEOM_LABEL	opt_geom.h
95
GEOM_LINUX_LVM	opt_geom.h
95
GEOM_LINUX_LVM	opt_geom.h
96
GEOM_MAP	opt_geom.h
96
GEOM_MBR	opt_geom.h
97
GEOM_MBR	opt_geom.h
97
GEOM_MIRROR	opt_geom.h
98
GEOM_MIRROR	opt_geom.h
98
GEOM_MULTIPATH	opt_geom.h
99
GEOM_MULTIPATH	opt_geom.h
(-)sys/conf/NOTES (+1 lines)
Lines 150-155 Link Here
150
options 	GEOM_JOURNAL		# Journaling.
150
options 	GEOM_JOURNAL		# Journaling.
151
options 	GEOM_LABEL		# Providers labelization.
151
options 	GEOM_LABEL		# Providers labelization.
152
options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
152
options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
153
options 	GEOM_MAP		# Map based partitioning
153
options 	GEOM_MBR		# DOS/MBR partitioning
154
options 	GEOM_MBR		# DOS/MBR partitioning
154
options 	GEOM_MIRROR		# Disk mirroring.
155
options 	GEOM_MIRROR		# Disk mirroring.
155
options 	GEOM_MULTIPATH		# Disk multipath
156
options 	GEOM_MULTIPATH		# Disk multipath
(-)sys/geom/geom_map.c (-10 / +14 lines)
Lines 119-131 g_map_dumpconf(struct sbuf *sb, const ch Link Here
119
	g_slice_dumpconf(sb, indent, gp, cp, pp);
119
	g_slice_dumpconf(sb, indent, gp, cp, pp);
120
	if (pp != NULL) {
120
	if (pp != NULL) {
121
		if (indent == NULL) {
121
		if (indent == NULL) {
122
			sbuf_printf(sb, " entry %lld", sc->entry[pp->index]);
122
			sbuf_printf(sb, " entry %jd",
123
			sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]);
123
			    (intmax_t)sc->entry[pp->index]);
124
			sbuf_printf(sb, " dsize %jd",
125
			    (intmax_t)sc->dsize[pp->index]);
124
		} else {
126
		} else {
125
			sbuf_printf(sb, "%s<entry>%lld</entry>\n", indent,
127
			sbuf_printf(sb, "%s<entry>%jd</entry>\n", indent,
126
			    sc->entry[pp->index]);
128
			    (intmax_t)sc->entry[pp->index]);
127
			sbuf_printf(sb, "%s<dsize>%lld</dsize>\n", indent,
129
			sbuf_printf(sb, "%s<dsize>%jd</dsize>\n", indent,
128
			    sc->dsize[pp->index]);
130
			    (intmax_t)sc->dsize[pp->index]);
129
		}
131
		}
130
	}
132
	}
131
}
133
}
Lines 153-160 find_marker(struct g_consumer *cp, const Link Here
153
		return (1);
155
		return (1);
154
156
155
	if (bootverbose) {
157
	if (bootverbose) {
156
		printf("MAP: search key \"%s\" from 0x%llx, step 0x%llx\n",
158
		printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n",
157
		    search_key, search_start, search_step);
159
		    search_key,
160
		    (uintmax_t)search_start, (uintmax_t)search_step);
158
	}
161
	}
159
162
160
	/* error if search_key is empty */
163
	/* error if search_key is empty */
Lines 321-329 g_map_parse_part(struct g_class *mp, str Link Here
321
	}
324
	}
322
325
323
	if (bootverbose) {
326
	if (bootverbose) {
324
		printf("MAP: %llxx%llx, data=%llxx%llx "
327
		printf("MAP: %jxx%jx, data=%jxx%jx "
325
		    "\"/dev/map/%s\"\n",
328
		    "\"/dev/map/%s\"\n",
326
		    start, size, offset, dsize, name);
329
		    (uintmax_t)start, (uintmax_t)size,
330
		    (uintmax_t)offset, (uintmax_t)dsize, name);
327
	}
331
	}
328
332
329
	sc->offset[i] = start;
333
	sc->offset[i] = start;

Return to bug 197766