Author: ae
Date: Thu Jan 23 19:31:17 2014
New Revision: 261085
URL: http://svnweb.freebsd.org/changeset/base/261085
Log:
Fix typo in r261084.
Add to the gctl_error() an ability to specify error description even
if numeric error code is already specified. Also by default set
error code to EINVAL.
PR: 185852
MFC after: 1 week
Modified:
head/sys/geom/geom_ctl.c
Modified: head/sys/geom/geom_ctl.c
==============================================================================
--- head/sys/geom/geom_ctl.c Thu Jan 23 19:07:22 2014 (r261084)
+++ head/sys/geom/geom_ctl.c Thu Jan 23 19:31:17 2014 (r261085)
@@ -84,8 +84,8 @@ g_ctl_init(void)
}
/*
- * Report an error back to the user in ascii format. Return whatever copyout
- * returned, or EINVAL if it succeeded.
+ * Report an error back to the user in ascii format. Return nerror
+ * or EINVAL if nerror isn't specified.
*/
int
gctl_error(struct gctl_req *req, const char *fmt, ...)
@@ -99,9 +99,10 @@ gctl_error(struct gctl_req *req, const c
if (sbuf_done(req->serror)) {
if (!req->nerror)
req->nerror = EEXIST;
- }
- if (req->nerror)
return (req->nerror);
+ }
+ if (!req->nerror)
+ req->nerror = EINVAL;
va_start(ap, fmt);
sbuf_vprintf(req->serror, fmt, ap);
@@ -109,7 +110,7 @@ gctl_error(struct gctl_req *req, const c
sbuf_finish(req->serror);
if (g_debugflags & G_F_CTLDUMP)
printf("gctl %p error \"%s\"\n", req, sbuf_data(req->serror));
- return (0);
+ return (req->nerror);
}
/*
@@ -122,7 +123,7 @@ geom_alloc_copyin(struct gctl_req *req,
void *ptr;
ptr = g_malloc(len, M_WAITOK);
- nreq->nerror = copyin(uaddr, ptr, len);
+ req->nerror = copyin(uaddr, ptr, len);
if (!req->nerror)
return (ptr);
if (ptr != NULL)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
