diff options
author | Richard Yao <[email protected]> | 2022-09-13 19:40:10 -0400 |
---|---|---|
committer | GitHub <[email protected]> | 2022-09-13 16:40:10 -0700 |
commit | d5d10f2aef98e86d4873c435cdbd9b3ced447caf (patch) | |
tree | 392a49862db7ba31da3a7126b98dc4e2e8e38a2f /module | |
parent | 710fd1ded68491a164d85aedc69ffd4675ec5c59 (diff) |
Cleanup dead spa_boot code
Unused code detected by coverity.
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Neal Gompa <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Closes #13868
Diffstat (limited to 'module')
-rw-r--r-- | module/Kbuild.in | 1 | ||||
-rw-r--r-- | module/Makefile.bsd | 1 | ||||
-rw-r--r-- | module/os/freebsd/zfs/spa_os.c | 1 | ||||
-rw-r--r-- | module/os/freebsd/zfs/zfs_vfsops.c | 1 | ||||
-rw-r--r-- | module/os/linux/zfs/zfs_vfsops.c | 1 | ||||
-rw-r--r-- | module/zfs/spa.c | 1 | ||||
-rw-r--r-- | module/zfs/spa_boot.c | 50 |
7 files changed, 0 insertions, 56 deletions
diff --git a/module/Kbuild.in b/module/Kbuild.in index 4803952cb..7a20e6ee4 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in @@ -345,7 +345,6 @@ ZFS_OBJS := \ sha256.o \ skein_zfs.o \ spa.o \ - spa_boot.o \ spa_checkpoint.o \ spa_config.o \ spa_errlog.o \ diff --git a/module/Makefile.bsd b/module/Makefile.bsd index 050b6c21e..8829ad942 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -271,7 +271,6 @@ SRCS+= abd.c \ sha256.c \ skein_zfs.c \ spa.c \ - spa_boot.c \ spa_checkpoint.c \ spa_config.c \ spa_errlog.c \ diff --git a/module/os/freebsd/zfs/spa_os.c b/module/os/freebsd/zfs/spa_os.c index 251fafcc9..9bc61a6c8 100644 --- a/module/os/freebsd/zfs/spa_os.c +++ b/module/os/freebsd/zfs/spa_os.c @@ -58,7 +58,6 @@ #include <sys/fs/zfs.h> #include <sys/arc.h> #include <sys/callb.h> -#include <sys/spa_boot.h> #include <sys/zfs_ioctl.h> #include <sys/dsl_scan.h> #include <sys/dmu_send.h> diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c index 4e4a5f8d2..8b60b34d8 100644 --- a/module/os/freebsd/zfs/zfs_vfsops.c +++ b/module/os/freebsd/zfs/zfs_vfsops.c @@ -62,7 +62,6 @@ #include <sys/sunddi.h> #include <sys/dmu_objset.h> #include <sys/dsl_dir.h> -#include <sys/spa_boot.h> #include <sys/jail.h> #include <ufs/ufs/quota.h> #include <sys/zfs_quota.h> diff --git a/module/os/linux/zfs/zfs_vfsops.c b/module/os/linux/zfs/zfs_vfsops.c index eac3dcb6a..d0575fe5e 100644 --- a/module/os/linux/zfs/zfs_vfsops.c +++ b/module/os/linux/zfs/zfs_vfsops.c @@ -56,7 +56,6 @@ #include <sys/sunddi.h> #include <sys/dmu_objset.h> #include <sys/dsl_dir.h> -#include <sys/spa_boot.h> #include <sys/objlist.h> #include <sys/zpl.h> #include <linux/vfs_compat.h> diff --git a/module/zfs/spa.c b/module/zfs/spa.c index b2b59af42..eeec3b6be 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -81,7 +81,6 @@ #include <sys/arc.h> #include <sys/callb.h> #include <sys/systeminfo.h> -#include <sys/spa_boot.h> #include <sys/zfs_ioctl.h> #include <sys/dsl_scan.h> #include <sys/zfeature.h> diff --git a/module/zfs/spa_boot.c b/module/zfs/spa_boot.c deleted file mode 100644 index fddb5c3c9..000000000 --- a/module/zfs/spa_boot.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or https://opensource.org/licenses/CDDL-1.0. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifdef _KERNEL - -#include <sys/zio.h> -#include <sys/spa_boot.h> -#include <sys/sunddi.h> - -char * -spa_get_bootprop(char *propname) -{ - char *value; - - if (ddi_prop_lookup_string(DDI_DEV_T_ANY, ddi_root_node(), - DDI_PROP_DONTPASS, propname, &value) != DDI_SUCCESS) - return (NULL); - return (value); -} - -void -spa_free_bootprop(char *value) -{ - ddi_prop_free(value); -} - -#endif /* _KERNEL */ |