From 817cb6ca1f585f03fdd44cea0be5889a751e703a Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 22 Apr 2003 19:42:05 +0000 Subject: Collapse meta arguments into regular arguments, the distinction is more trouble than it is worth. --- sys/geom/geom_ctl.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'sys/geom/geom_ctl.c') diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index 0457972..ab50552 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -151,13 +151,8 @@ gctl_copyin(struct gctl_req *req) !useracc(ap[i].value, ap[i].len, ap[i].flag & GCTL_PARAM_RW)) error = gctl_error(req, "no access to param data"); - if (ap[i].name == NULL) { - if (req->reqt->meta) - continue; - error = gctl_error(req, - "request does not take metadata arguments"); + if (error) break; - } p = NULL; if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) { error = gctl_error(req, "wrong param name length"); @@ -205,10 +200,7 @@ gctl_dump(struct gctl_req *req) } for (i = 0; i < req->narg; i++) { ap = &req->arg[i]; - if (ap->name != NULL) - printf(" param:\t\"%s\"", ap->name); - else - printf(" meta:\t@%jd", (intmax_t)ap->offset); + printf(" param:\t\"%s\"", ap->name); printf(" [%s%s%d] = ", ap->flag & GCTL_PARAM_RD ? "R" : "", ap->flag & GCTL_PARAM_WR ? "W" : "", -- cgit v1.1