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

Add a "-S sectorsize" option to enable Kirk to find a bug :-)

Browse Source
This commit is contained in:
phk 2003-03-03 13:05:00 +00:00
parent 8a0180038b
commit 7499df5457
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/mdconfig/mdconfig.8
View File

@ -57,6 +57,7 @@
.Oc
.Op Fl s Ar size
.Op Fl f Ar file
.Op Fl S Ar sectorsize
.Op Fl u Ar unit
.Nm
.Fl d
@ -111,6 +112,8 @@ or
.Cm g
which
denotes kilobyte, megabyte and gigabyte respectively.
.It Fl S Ar sectorsize
Sectorsize to use for malloc backed device.
.It Fl o Oo Cm no Oc Ns Ar option
Set or reset options.
.Bl -tag -width indent

9
sbin/mdconfig/mdconfig.c
View File

@ -37,7 +37,7 @@ void
usage()
{
fprintf(stderr, "usage:\n");
fprintf(stderr, "\tmdconfig -a -t type [-o [no]option]... [ -f file] [-s size] [-u unit]\n");
fprintf(stderr, "\tmdconfig -a -t type [-o [no]option]... [ -f file] [-s size] [-S sectorsize] [-u unit]\n");
fprintf(stderr, "\tmdconfig -d -u unit\n");
fprintf(stderr, "\tmdconfig -l [-u unit]\n");
fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n");
@ -54,7 +54,7 @@ main(int argc, char **argv)
int cmdline = 0;
for (;;) {
ch = getopt(argc, argv, "ab:df:lo:s:t:u:");
ch = getopt(argc, argv, "ab:df:lo:s:S:t:u:");
if (ch == -1)
break;
switch (ch) {
@ -130,6 +130,11 @@ main(int argc, char **argv)
else
errx(1, "Unknown option.");
break;
case 'S':
if (cmdline != 2)
usage();
mdio.md_secsize = strtoul(optarg, &p, 0);
break;
case 's':
if (cmdline != 2)
usage();

8
sys/dev/md/md.c
View File

@ -746,6 +746,8 @@ mdcreate_malloc(struct md_ioctl *mdio)
return (EINVAL);
if (mdio->md_options & ~(MD_AUTOUNIT | MD_COMPRESS | MD_RESERVE))
return (EINVAL);
if (mdio->md_secsize != 0 && !powerof2(mdio->md_secsize))
return (EINVAL);
/* Compression doesn't make sense if we have reserved space */
if (mdio->md_options & MD_RESERVE)
mdio->md_options &= ~MD_COMPRESS;
@ -760,8 +762,12 @@ mdcreate_malloc(struct md_ioctl *mdio)
return (EBUSY);
}
sc->type = MD_MALLOC;
sc->secsize = DEV_BSIZE;
if (mdio->md_secsize != 0)
sc->secsize = mdio->md_secsize;
else
sc->secsize = DEV_BSIZE;
sc->nsect = mdio->md_size;
sc->nsect /= (sc->secsize / DEV_BSIZE);
sc->flags = mdio->md_options & (MD_COMPRESS | MD_FORCE);
sc->indir = dimension(sc->nsect);
sc->uma = uma_zcreate(sc->name, sc->secsize,

3
sys/sys/mdioctl.h
View File

@ -53,7 +53,7 @@ enum md_types {MD_MALLOC, MD_PRELOAD, MD_VNODE, MD_SWAP};
* Ioctl definitions for memory disk pseudo-device.
*/
#define MDNPAD 100
#define MDNPAD 99
struct md_ioctl {
unsigned md_version; /* Structure layout version */
unsigned md_unit; /* unit number */
@ -62,6 +62,7 @@ struct md_ioctl {
unsigned md_size; /* size of disk in DEV_BSIZE units */
unsigned md_options; /* options */
u_int64_t md_base; /* base address */
int md_secsize; /* sectorsize */
int md_pad[MDNPAD]; /* padding for future ideas */
};