From nobody Thu Jun 25 03:08:55 2026 X-Original-To: dev-commits-src-main@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 4gm3fv3j07z6hLGB for ; Thu, 25 Jun 2026 03:08:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gm3fv1bbpz3vJn for ; Thu, 25 Jun 2026 03:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782356935; 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=/CV7xgwBrcJHU9scqTrypGyy8X7eMMQYNhNNSGqQHbk=; b=hfF+o6nS+lmczEzqQ/SCphDBkoSozYg2BOpZh4K7oKvHXNvEoPBnRyGkgxBIiQqyLag/Yf x4zj35sB1fnBzhFsGt/jUprrNSELE+XOSNJsQPEEKKZafyjj2nvfuQU4cRpVp0Tm3vfyWk eJvwabxTUdRbbQSCTZ9PzUck4S1NLAmdWSvsgF35z3+fB95ijs6WBzOG6F3pl42rTmux4M EjOJnnHRydrgy+++ABxdXh9xERDGRUBl8lBOyfONzXP6NEmIUXzKIElerkPTHIHP98ojhb cOkUT4EARWjr0eEANQtgAxS0/3MaGMklXZQvf26XcVoWvNwBVZtSQci4MefZPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782356935; a=rsa-sha256; cv=none; b=nSCkcD5YbICpgYw7LmXehjehUvYKGqFmOE14/eew1l8L3w8NWkw0Y0h1fSLV15LF8gxqo8 Qy15QDjj/11I9AW4MGOZ0+mP5bFuzt8wrvpegbg+mpW0nRmf7i4OL/1ln7pxK5Smun6WXD uG/XQI/aFCNZpsdWZE2EpcxflsYW8GycxIkBBfmMFx9n5x3FG50trbYc1wJLFNUVeXwjRT OVn/ih/KAaZcCTWS9y5RrL0pCGYVuql8TSMYJvve7GC9jkoY4F54EpQbxhbGcuXJ/4nARa kaPwquQVwyDgnmUOr3bsrjKq4Pl68lwFaBasSnh8suTdNHatHpywda2I0JTF/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782356935; 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=/CV7xgwBrcJHU9scqTrypGyy8X7eMMQYNhNNSGqQHbk=; b=gdytlEtGxAh7b8brV80h0haujJLzAs4W9+ZIFdluQ8VQYaEZqIQOF06ZpWnY7MlDOei3Vl 4QYtA8F6lnXNDeF55vLrfNvvG0a1C4KEEWnXr4Ho7ELQ9FEuSxDGb65ivqvd/95rsOvyGp JWiP3xuaGP9mpGjsuwMOtc4EfO9g03N72cT/XIA2JWYo5H/Fy2FN46VyeCz1iLVBtFUyt/ TxZqhQnPCYE2ag89CQRo7ZtGeeyaukwkKCgROZCONzsHGtOh0Vejkh5d2JAGGFakAJSXt0 xDr2iE9HsNIBbJ0oTRLmMhkqOT0FNe+ca2vay+PnE0AB/kJ9kS8bDoZSrlpy/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm3fv0FCNzpVf for ; Thu, 25 Jun 2026 03:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 03:08:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 72ebcfae48c4 - main - kern: osd: abstract away the math for locating a slot method List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ebcfae48c42cb28ab6142980416082f8d70abc Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 03:08:55 +0000 Message-Id: <6a3c9bc7.1bd3e.70c46a29@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=72ebcfae48c42cb28ab6142980416082f8d70abc commit 72ebcfae48c42cb28ab6142980416082f8d70abc Author: Kyle Evans AuthorDate: 2026-06-25 03:08:05 +0000 Commit: Kyle Evans CommitDate: 2026-06-25 03:08:13 +0000 kern: osd: abstract away the math for locating a slot method It's relatively simple, but we'll do it a couple of times; pull it out into a macro. Reviewed by: imp (previous version), jamie Differential Revision: https://reviews.freebsd.org/D48074 --- sys/kern/kern_osd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c index 93809ccab8e5..b64735e7f93a 100644 --- a/sys/kern/kern_osd.c +++ b/sys/kern/kern_osd.c @@ -73,6 +73,9 @@ SYSCTL_INT(_debug, OID_AUTO, osd, CTLFLAG_RWTUN, &osd_debug, 0, "OSD debug level } \ } while (0) +#define OSD_METHOD(osdm, slot, method) \ + ((osdm).osd_methods[((slot) - 1) * (osdm).osd_nmethods + (method)]) + static void do_osd_del(u_int type, struct osd *osd, u_int slot, int list_locked); @@ -139,8 +142,8 @@ osd_register(u_int type, osd_destructor_t destructor, const osd_method_t *method osdm[type].osd_destructors[i] = destructor; if (osdm[type].osd_nmethods != 0) { for (m = 0; m < osdm[type].osd_nmethods; m++) - osdm[type].osd_methods[i * osdm[type].osd_nmethods + m] - = methods != NULL ? methods[m] : NULL; + OSD_METHOD(osdm[type], i + 1, m) = + methods != NULL ? methods[m] : NULL; } sx_xunlock(&osdm[type].osd_module_lock); return (i + 1); @@ -391,8 +394,7 @@ osd_call(u_int type, u_int method, void *obj, void *data) /* Hole in the slot map; avoid dereferencing. */ if (osdm[type].osd_destructors[i] == NULL) continue; - methodfun = osdm[type].osd_methods[i * osdm[type].osd_nmethods + - method]; + methodfun = OSD_METHOD(osdm[type], i + 1, method); if (methodfun != NULL && (error = methodfun(obj, data)) != 0) break; }