From nobody Fri May 27 16:23:29 2022 X-Original-To: dev-commits-src-branches@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 E93C51B4FC03; Fri, 27 May 2022 16:23:29 +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 4L8qqP6JSJz3sc2; Fri, 27 May 2022 16:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653668609; 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=D2v99LFtFKknvSd8o24INUYclse6S+b9QBuvTfoIVwE=; b=mE260cHezmyEBc34jb5PRVx4D19utCeSFts6ao4xojbyjaqdFAasleoljMAiuvDrNlQMex CJfBddeRpeBWZm3BhWqFL6Ylju3VoLnbbhQxczGAQW6vsQnkB7C1A+vfcibRIDTidEf1sD dxk3Zk4+hiigB+4cGiaXukBx2TIM+swhE/4sxfU76kTMpn3TKspmGMjEf1ovWfV1ccxiaT 1tfaEyilE44NasGr3eMFaRZNw7biAsOTXctV+iYDzGKzzdiRkXZkW2krE/hekuywcHPBel NnbE8dLNS3W2sHXhWImj0HMPql+ofJttUQSY9/o2tSl/1X1FrB/3sGn4zTCZkg== 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 ADF14254E6; Fri, 27 May 2022 16:23:29 +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 24RGNT4h096606; Fri, 27 May 2022 16:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RGNTB6096605; Fri, 27 May 2022 16:23:29 GMT (envelope-from git) Date: Fri, 27 May 2022 16:23:29 GMT Message-Id: <202205271623.24RGNTB6096605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6350ace614fc - stable/13 - Drop d_dump from struct cdevsw List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6350ace614fc329b786f063e6633c191b8dedadb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653668609; 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=D2v99LFtFKknvSd8o24INUYclse6S+b9QBuvTfoIVwE=; b=jesn3s2F7rnAqNlh9CB6SSgMeQA7obYX7IuwxZQ9zvfqI4lJl7NjVsu/FzF/4TTkYafSyJ Df6f1lWEkvXQUzBMkcTwVeYuDCCKj3TrjZ5q6oE4RKw3MOTblf9ChfEMEbYM6439PF8EMc xW+AaS9LYfI3L+ns5rN4a1a55bUTgTGRAAYRVAp77lRgXgKfxYxJ6xa+4FvLkSdLq2fkDm OP3QhH78NobU/XXVFlpEF8OCDkeVIyE1m9rFMiNF5L092SS3lktcpujRnh6Ttjf2AJ2tBb 2GOc0MvUTVTmvTeuYTpc3JRi+lrdyo/6KtMdMcPcxkPyaxAxUXsRLgPIngmebg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653668609; a=rsa-sha256; cv=none; b=bSp3u5vqdTKRDRIJ7meTHXWdIdkDcuVKVgoWkv3MT3YeI/kkg2eT0+Uexy9rj/MKXMaMti 4SBWJFthu7eFLXoAOj7y1OUCp3AnVusqEiP59e5dPS7Eu2R6NaLNc8GGeEAlKuI3i7Qi4l PBoxKiCdstPLhGxVDVedoTGtIDWkoA89nTNgBlfmOt4uvlnRI/66+jlRgriLFv/Jyk2izd rmRsCQwuQf1ic2ZpOFI36EWlS+A5SqJjJjlrBbWBOcXuX90zJ1j1D86vzOladZdoiYbSeO vxtlcM26BDyEJSUBN3t+uOUMebKKHSU7k9j5CtRS588h4/xZKKl8SRjx9KugeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6350ace614fc329b786f063e6633c191b8dedadb commit 6350ace614fc329b786f063e6633c191b8dedadb Author: Mitchell Horne AuthorDate: 2022-05-13 13:38:54 +0000 Commit: Mitchell Horne CommitDate: 2022-05-27 16:22:22 +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 (cherry picked from commit 0f50da2e09b7dddad25953d0c167efe09f7282eb) --- 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 7c9c59e3fcdf..cd0c6e89635b 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -210,17 +210,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;