The branch main has been updated by mav:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=dd7a5bc1e6d9d5a102ba384531e2ec09ba60e3a1

commit dd7a5bc1e6d9d5a102ba384531e2ec09ba60e3a1
Author:     Alexander Motin <m...@freebsd.org>
AuthorDate: 2022-03-07 19:40:28 +0000
Commit:     Alexander Motin <m...@freebsd.org>
CommitDate: 2022-03-07 19:41:47 +0000

    GEOM: Make G_F_CTLDUMP also dump result.
    
    MFC after:      1 month
---
 sys/geom/geom_ctl.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index ce308d236dc1..307ccd989ca0 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -282,13 +282,13 @@ gctl_free(struct gctl_req *req)
 }
 
 static void
-gctl_dump(struct gctl_req *req)
+gctl_dump(struct gctl_req *req, const char *what)
 {
        struct gctl_req_arg *ap;
        u_int i;
        int j;
 
-       printf("Dump of gctl request at %p:\n", req);
+       printf("Dump of gctl %s at %p:\n", what, req);
        if (req->nerror > 0) {
                printf("  nerror:\t%d\n", req->nerror);
                if (sbuf_len(req->serror) > 0)
@@ -540,10 +540,14 @@ g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t 
data, int fflag, struct th
                gctl_copyin(req);
 
                if (g_debugflags & G_F_CTLDUMP)
-                       gctl_dump(req);
+                       gctl_dump(req, "request");
 
                if (!req->nerror) {
                        g_waitfor_event(g_ctl_req, req, M_WAITOK, NULL);
+
+                       if (g_debugflags & G_F_CTLDUMP)
+                               gctl_dump(req, "result");
+
                        gctl_copyout(req);
                }
        }

Reply via email to