Author: ae
Date: Wed Jul 6 05:40:22 2011
New Revision: 223816
URL: http://svn.freebsd.org/changeset/base/223816
Log:
MFC r223660:
Initialize elements of state array when creating the GPT table.
This fixes the problem, when the secondary GPT header is not erased when
partition table destroyed. Move equal operations from g_part_gpt_create
and g_part_gpt_recover to the separate function g_gpt_set_defaults.
Modified:
stable/8/sys/geom/part/g_part_gpt.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/geom/part/g_part_gpt.c
==============================================================================
--- stable/8/sys/geom/part/g_part_gpt.c Wed Jul 6 00:50:54 2011
(r223815)
+++ stable/8/sys/geom/part/g_part_gpt.c Wed Jul 6 05:40:22 2011
(r223816)
@@ -85,6 +85,7 @@ struct g_part_gpt_entry {
static void g_gpt_printf_utf16(struct sbuf *, uint16_t *, size_t);
static void g_gpt_utf8_to_utf16(const uint8_t *, uint16_t *, size_t);
+static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *);
static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
@@ -490,12 +491,7 @@ g_part_gpt_create(struct g_part_table *b
table->mbr[DOSPARTOFF + 6] = 0xff; /* esect */
table->mbr[DOSPARTOFF + 7] = 0xff; /* ecyl */
le32enc(table->mbr + DOSPARTOFF + 8, 1); /* start */
- le32enc(table->mbr + DOSPARTOFF + 12, MIN(last, 0xffffffffLL));
-
- table->lba[GPT_ELT_PRIHDR] = 1;
- table->lba[GPT_ELT_PRITBL] = 2;
- table->lba[GPT_ELT_SECHDR] = last;
- table->lba[GPT_ELT_SECTBL] = last - tblsz;
+ le32enc(table->mbr + DOSPARTOFF + 12, MIN(last, UINT32_MAX));
/* Allocate space for the header */
table->hdr = g_malloc(sizeof(struct gpt_hdr), M_WAITOK | M_ZERO);
@@ -503,14 +499,11 @@ g_part_gpt_create(struct g_part_table *b
bcopy(GPT_HDR_SIG, table->hdr->hdr_sig, sizeof(table->hdr->hdr_sig));
table->hdr->hdr_revision = GPT_HDR_REVISION;
table->hdr->hdr_size = offsetof(struct gpt_hdr, padding);
- table->hdr->hdr_lba_start = 2 + tblsz;
- table->hdr->hdr_lba_end = last - tblsz - 1;
kern_uuidgen(&table->hdr->hdr_uuid, 1);
table->hdr->hdr_entries = basetable->gpt_entries;
table->hdr->hdr_entsz = sizeof(struct gpt_ent);
- basetable->gpt_first = table->hdr->hdr_lba_start;
- basetable->gpt_last = table->hdr->hdr_lba_end;
+ g_gpt_set_defaults(basetable, pp);
return (0);
}
@@ -812,32 +805,10 @@ g_part_gpt_read(struct g_part_table *bas
static int
g_part_gpt_recover(struct g_part_table *basetable)
{
- struct g_part_gpt_table *table;
- struct g_provider *pp;
- uint64_t last;
- size_t tblsz;
-
- table = (struct g_part_gpt_table *)basetable;
- pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
- last = pp->mediasize / pp->sectorsize - 1;
- tblsz = (table->hdr->hdr_entries * table->hdr->hdr_entsz +
- pp->sectorsize - 1) / pp->sectorsize;
-
- table->lba[GPT_ELT_PRIHDR] = 1;
- table->lba[GPT_ELT_PRITBL] = 2;
- table->lba[GPT_ELT_SECHDR] = last;
- table->lba[GPT_ELT_SECTBL] = last - tblsz;
- table->state[GPT_ELT_PRIHDR] = GPT_STATE_OK;
- table->state[GPT_ELT_PRITBL] = GPT_STATE_OK;
- table->state[GPT_ELT_SECHDR] = GPT_STATE_OK;
- table->state[GPT_ELT_SECTBL] = GPT_STATE_OK;
- table->hdr->hdr_lba_start = 2 + tblsz;
- table->hdr->hdr_lba_end = last - tblsz - 1;
- basetable->gpt_first = table->hdr->hdr_lba_start;
- basetable->gpt_last = table->hdr->hdr_lba_end;
+ g_gpt_set_defaults(basetable,
+ LIST_FIRST(&basetable->gpt_gp->consumer)->provider);
basetable->gpt_corrupt = 0;
-
return (0);
}
@@ -1036,6 +1007,34 @@ g_part_gpt_write(struct g_part_table *ba
}
static void
+g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp)
+{
+ struct g_part_gpt_table *table;
+ quad_t last;
+ size_t tblsz;
+
+ table = (struct g_part_gpt_table *)basetable;
+ last = pp->mediasize / pp->sectorsize - 1;
+ tblsz = (basetable->gpt_entries * sizeof(struct gpt_ent) +
+ pp->sectorsize - 1) / pp->sectorsize;
+
+ table->lba[GPT_ELT_PRIHDR] = 1;
+ table->lba[GPT_ELT_PRITBL] = 2;
+ table->lba[GPT_ELT_SECHDR] = last;
+ table->lba[GPT_ELT_SECTBL] = last - tblsz;
+ table->state[GPT_ELT_PRIHDR] = GPT_STATE_OK;
+ table->state[GPT_ELT_PRITBL] = GPT_STATE_OK;
+ table->state[GPT_ELT_SECHDR] = GPT_STATE_OK;
+ table->state[GPT_ELT_SECTBL] = GPT_STATE_OK;
+
+ table->hdr->hdr_lba_start = 2 + tblsz;
+ table->hdr->hdr_lba_end = last - tblsz - 1;
+
+ basetable->gpt_first = table->hdr->hdr_lba_start;
+ basetable->gpt_last = table->hdr->hdr_lba_end;
+}
+
+static void
g_gpt_printf_utf16(struct sbuf *sb, uint16_t *str, size_t len)
{
u_int bo;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
