From nobody Wed Apr 06 02:45:19 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7F2401A80897; Wed, 6 Apr 2022 02:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KY84w3hZQz4ZdK; Wed, 6 Apr 2022 02:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649213121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmMb1jSMROxCkr7NhXQ2oEPLLm7z+tUUz5TJnMYXgVM=; b=SGCwcbSL3KEpGORKHxUtoIcH7w6/OQ2ISGB3hV8C3Oxg0CS4E9oZFAl2aOaEelCODmxqMo YWkQuZqh/G03sE/xRiShBgsjBxJrWuRmKJXm5ITvWgjQwYfxsUY5dQffFCcSObIUa8CA9f xADA25/KWcTeoUURGmZEwmpI/fJawoJRbgohyg/cEq+jp9mFWSnfqnX06kn0dd6jSeS/Fp ecC7rra27oq8ij+s7pKOb3cP6rUU4rrYTZly2Wkldkz7PvwJiFD1yt8PlPNjoLb2M0AF8I dmx+Hejr+bN/xVYOo8LMWaRJ+A5e8bmHwSkIEYqBJ15knophALMJlWY9Dqrv2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20EB912B71; Wed, 6 Apr 2022 02:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2362jKVi006495; Wed, 6 Apr 2022 02:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2362jJAQ006494; Wed, 6 Apr 2022 02:45:19 GMT (envelope-from git) Date: Wed, 6 Apr 2022 02:45:19 GMT Message-Id: <202204060245.2362jJAQ006494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: aacc15792681 - stable/13 - GEOM: Make G_F_CTLDUMP also dump result. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aacc1579268125a41f71c085bbabe9e5095cc009 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649213120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmMb1jSMROxCkr7NhXQ2oEPLLm7z+tUUz5TJnMYXgVM=; b=viBxmP7kG6edTsZcgAVcKdfAHPRNiHz4gCyb0RHunEBRK53YPHFM3lPJGwBB3a8ZlVCyeW hDHik91fCb6Bp7xGFRWhb/c0TWR40PYtOjDNA5SvYwQH3G15VXJsMMUCG0y02AzWV3S+it uQSL1Y7tTEQ3+rWvtP9Dzk4nj2Z9z3azL6Eb76KhHYWX/t8Bxhv8Bd7aA8fxiN6ztREj3x liGG+hVfBWSmIhjFZeyYTWBtroOyVG888DWN9aQwPBLljBrQfkMV7LBhM3I1GJJirjbI1C TG/gz41AHdc4aY2N4PpztPGG11jfuj7xPrPQblugDXOgD9sNHh0jaUyGjBBD+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649213120; a=rsa-sha256; cv=none; b=wnOcWwPS1vBuYV+ltPgnvjSyO+SblUTf8GVN96ztMhv9y7U5E7po6tDgFqkSc0gEvrmm8A OTlr9yGkwHfSUdQfLNaV+VqM1Q+rkVcliFUihfT36fmzsHQUI8q+z8iEgRmhXLAip6Kmme agQo5rQcsEkxMJRsgKHlFpXh7rSmUueGX/yOiApkZ5T5HRWg3w5PnJdpMhPPpkxM29ODVZ ELI0thMB0uaO+UcVJ0DFxcHt0ok0ygtrRmeVFNWfKbmO6r6j5q0c+3AsVu/WWHQlQYPEe+ aVjowRAc2KCyFypAPkVDLewqG1vniZPqtBbK+G8ArCLPykEvHOZuax3O6yyV6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=aacc1579268125a41f71c085bbabe9e5095cc009 commit aacc1579268125a41f71c085bbabe9e5095cc009 Author: Alexander Motin AuthorDate: 2022-03-07 19:40:28 +0000 Commit: Alexander Motin CommitDate: 2022-04-06 02:07:40 +0000 GEOM: Make G_F_CTLDUMP also dump result. MFC after: 1 month (cherry picked from commit dd7a5bc1e6d9d5a102ba384531e2ec09ba60e3a1) --- 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 5690b857a639..ba22a2c5216a 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -229,13 +229,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) @@ -487,10 +487,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); } }