From nobody Fri May 13 13:43:45 2022 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 C64B21AD193C; Fri, 13 May 2022 13:43:45 +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 4L08xY5Bqzz3Hpy; Fri, 13 May 2022 13:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652449425; 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=xVB1g+IpssQOTP23T8yS+pFREXC+cLKvQFSHB/eJ5Lg=; b=Icm9NacB/2g4v3ECzMJLqu4SCpkN+D/cS18dFvLH6mJ1zKTy9m2trTl1CfhXbEAc4+8aAC l3tShTKOn+gQNtJRJBpMVIH9nzgPUC7OGbXVXJcdOAU9uhnJDJb4KVm6F0wpFCcuq+u9T6 j330r7NaY9lBLv7PqvFsAYLTSWRoHPGsNl+Ity9vosU+k8ey1oAhNJAeb6uMr0lb7/0mx1 WnO29i8R52MjwRDfUOczqHu+DJaXscAyI8jjzIjLOjNKA3OjBD9KQzzieD25Z0qi6yk6rQ s7k7nFMYBk/DlJxMh1YmGG+tVAP5tZHwfqfUasRpVJ/6ucir9nzFr1iusp6pMw== 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 9276823E8A; Fri, 13 May 2022 13:43:45 +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 24DDhjhT032064; Fri, 13 May 2022 13:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DDhjvD032063; Fri, 13 May 2022 13:43:45 GMT (envelope-from git) Date: Fri, 13 May 2022 13:43:45 GMT Message-Id: <202205131343.24DDhjvD032063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 0f50da2e09b7 - main - Drop d_dump from struct cdevsw 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f50da2e09b7dddad25953d0c167efe09f7282eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652449425; 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=xVB1g+IpssQOTP23T8yS+pFREXC+cLKvQFSHB/eJ5Lg=; b=nvIB59ONOvB6arCWR4/hbY/4dw/AWiGHFoOh6plb03dJB28e4GnU5EbmE8Tsb2dEC/ASYU wGu2kwjAQo/OXEBHpjMWz9G0ch/qQxRtdEd9Wbsvdmoq+TTyQdkMBOrBPpy/FbqNvX6Lqb NoMI3WdpmJGxEM3Ul6KJmFRYd90Fmp/4A71/1qQBg0vBjdjPmxcsg9xq0bZ9w9vttrj7TJ heSvUSpPwVt0H6fQ1oatrhP7ABtR0pC5aMiwpQL7641G7A5ZMQYfknshmUgzoMd8Wa83W5 FFU2qOM9eteJtshAWLVq8ZPGyCz9bxLdaTXHWOQFgpHC0OrJ0yg5bVNyL+QFpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652449425; a=rsa-sha256; cv=none; b=LgdNjygeeNGuc6ZvdtKArqcQ+RzzhkRPlq5qs/BUlFwgPBnWqAYZLZ1LMm13/5ZB1tc4/W 2UJW1yC2vD/4yC2Nn57/TY5P0wXKNkQQ3fQS4LOU0WoO9ENK2PUGpzU2dJaGzW346XCNjD YcLWJ+mIKxiKZkyWj1W+n+wZO+N3fvF6XTeLn6vgRoUIODHhBKcmGpLJa+hMDGxiD8W3Kf baLRzu5WQ5XTg/V0AowFjgnAdSaIc+p6/zT0fu12s7w9rxKTSs8NLMMz4kpLmTiew/KaB4 rsCtFd5gkOuJ5H6nt8r+80kcd/6eLeiZ3mmvqaQ0yLm9YC1Fc6qN10SZHGhr9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0f50da2e09b7dddad25953d0c167efe09f7282eb commit 0f50da2e09b7dddad25953d0c167efe09f7282eb Author: Mitchell Horne AuthorDate: 2022-05-13 13:38:54 +0000 Commit: Mitchell Horne CommitDate: 2022-05-13 13:42:17 +0000 Drop d_dump from struct cdevsw It appears to be unused. These days struct disk has a d_dump member, which is what gets passed to the kernel dump framework. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35172 --- sys/kern/kern_conf.c | 7 ------- sys/sys/conf.h | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index f6724095c762..1cd5bc2635c1 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -301,7 +301,6 @@ dead_strategy(struct bio *bp) biofinish(bp, NULL, ENXIO); } -#define dead_dump (dumper_t *)enxio #define dead_kqfilter (d_kqfilter_t *)enxio #define dead_mmap_single (d_mmap_single_t *)enodev @@ -316,7 +315,6 @@ static struct cdevsw dead_cdevsw = { .d_mmap = dead_mmap, .d_strategy = dead_strategy, .d_name = "dead", - .d_dump = dead_dump, .d_kqfilter = dead_kqfilter, .d_mmap_single = dead_mmap_single }; @@ -346,8 +344,6 @@ no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) return (poll_no_poll(events)); } -#define no_dump (dumper_t *)enodev - static int giant_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { @@ -662,7 +658,6 @@ prep_cdevsw(struct cdevsw *devsw, int flags) devsw->d_mmap = dead_mmap; devsw->d_mmap_single = dead_mmap_single; devsw->d_strategy = dead_strategy; - devsw->d_dump = dead_dump; devsw->d_kqfilter = dead_kqfilter; } @@ -701,8 +696,6 @@ prep_cdevsw(struct cdevsw *devsw, int flags) FIXUP(d_kqfilter, no_kqfilter, giant_kqfilter); FIXUP(d_mmap_single, no_mmap_single, giant_mmap_single); - if (devsw->d_dump == NULL) devsw->d_dump = no_dump; - LIST_INIT(&devsw->d_devs); devsw->d_flags |= D_INIT; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 4808de511d6b..02671a065c09 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -209,17 +209,17 @@ struct cdevsw { d_poll_t *d_poll; d_mmap_t *d_mmap; d_strategy_t *d_strategy; - dumper_t *d_dump; + void *d_spare0; d_kqfilter_t *d_kqfilter; d_purge_t *d_purge; d_mmap_single_t *d_mmap_single; - int32_t d_spare0[3]; - void *d_spare1[3]; + int32_t d_spare1[3]; + void *d_spare2[3]; /* These fields should not be messed with by drivers */ LIST_HEAD(, cdev) d_devs; - int d_spare2; + int d_spare3; union { struct cdevsw *gianttrick; SLIST_ENTRY(cdevsw) postfree_list;