d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don the asbestos underwear and add the code which lets DIOCWDINFO

Browse Source 
write modified disklabels back to disk.

Sponsored by:	DARPA & NAI Labs.
This commit is contained in:
Poul-Henning Kamp 2002-09-30 08:59:59 +00:00
parent f9f1b6f70f
commit 3a24c28f37
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/geom/geom_bsd.c
View File

@ -139,7 +139,6 @@ g_bsd_ledec_disklabel(u_char *ptr, struct disklabel *d)
g_bsd_ledec_partition(ptr + 148 + 16 * i, &d->d_partitions[i]);
}
#if 0
static void
g_bsd_leenc_partition(u_char *ptr, struct partition *d)
{
@ -196,8 +195,6 @@ g_bsd_leenc_disklabel(u_char *ptr, struct disklabel *d)
g_bsd_leenc_partition(ptr + 148 + 16 * i, &d->d_partitions[i]);
}
#endif
/*
* For reasons which were valid and just in their days, FreeBSD/i386 uses
* absolute disk-addresses in disklabels. The way it works is that the
@ -507,10 +504,29 @@ g_bsd_ioctl(void *arg)
ms->inram = *dl;
inram2ondisk(ms);
/* XXX: DIOCWDINFO write to disk */
/* return the request */
g_io_deliver(bp, 0);
if (gio->cmd == DIOCSDINFO) {
g_io_deliver(bp, 0);
return;
}
KASSERT(gio->cmd == DIOCWDINFO, ("Unknown ioctl in g_bsd_ioctl"));
cp = LIST_FIRST(&gp->consumer);
/* Get sector size, we need it to read data. */
error = g_getattr("GEOM::sectorsize", cp, &secsize);
if (error || secsize < 512) {
g_io_deliver(bp, error);
return;
}
secoff = ms->labeloffset % secsize;
buf = g_read_data(cp, ms->labeloffset - secoff, secsize, &error);
if (buf == NULL || error != 0) {
g_io_deliver(bp, error);
return;
}
dl = &ms->ondisk;
g_bsd_leenc_disklabel(buf + secoff, dl);
error = g_write_data(cp, ms->labeloffset - secoff, buf, secsize);
g_free(buf);
g_io_deliver(bp, error);
return;
}