From d5d10f2aef98e86d4873c435cdbd9b3ced447caf Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 13 Sep 2022 19:40:10 -0400 Subject: [PATCH] Cleanup dead spa_boot code Unused code detected by coverity. Reviewed-by: Allan Jude Reviewed-by: Ryan Moeller Reviewed-by: Brian Behlendorf Reviewed-by: Neal Gompa Signed-off-by: Richard Yao Closes #13868 --- include/Makefile.am | 1 - include/sys/spa_boot.h | 42 ------------------------- lib/libzpool/Makefile.am | 1 - module/Kbuild.in | 1 - module/Makefile.bsd | 1 - module/os/freebsd/zfs/spa_os.c | 1 - module/os/freebsd/zfs/zfs_vfsops.c | 1 - module/os/linux/zfs/zfs_vfsops.c | 1 - module/zfs/spa.c | 1 - module/zfs/spa_boot.c | 50 ------------------------------ 10 files changed, 100 deletions(-) delete mode 100644 include/sys/spa_boot.h delete mode 100644 module/zfs/spa_boot.c diff --git a/include/Makefile.am b/include/Makefile.am index 1a7f67e9c4..19726bba18 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -76,7 +76,6 @@ COMMON_H = \ sys/sa_impl.h \ sys/skein.h \ sys/spa.h \ - sys/spa_boot.h \ sys/spa_checkpoint.h \ sys/spa_checksum.h \ sys/spa_impl.h \ diff --git a/include/sys/spa_boot.h b/include/sys/spa_boot.h deleted file mode 100644 index 4a69efdda9..0000000000 --- a/include/sys/spa_boot.h +++ /dev/null @@ -1,42 +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. - */ - -#ifndef _SYS_SPA_BOOT_H -#define _SYS_SPA_BOOT_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern char *spa_get_bootprop(char *prop); -extern void spa_free_bootprop(char *prop); - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_SPA_BOOT_H */ diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index eaa920e561..0cc1997f7a 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -121,7 +121,6 @@ nodist_libzpool_la_SOURCES = \ module/zfs/sha256.c \ module/zfs/skein_zfs.c \ module/zfs/spa.c \ - module/zfs/spa_boot.c \ module/zfs/spa_checkpoint.c \ module/zfs/spa_config.c \ module/zfs/spa_errlog.c \ diff --git a/module/Kbuild.in b/module/Kbuild.in index 4803952cbf..7a20e6ee46 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 050b6c21e5..8829ad9421 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 251fafcc96..9bc61a6c8f 100644 --- a/module/os/freebsd/zfs/spa_os.c +++ b/module/os/freebsd/zfs/spa_os.c @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c index 4e4a5f8d21..8b60b34d85 100644 --- a/module/os/freebsd/zfs/zfs_vfsops.c +++ b/module/os/freebsd/zfs/zfs_vfsops.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/module/os/linux/zfs/zfs_vfsops.c b/module/os/linux/zfs/zfs_vfsops.c index eac3dcb6a5..d0575fe5e9 100644 --- a/module/os/linux/zfs/zfs_vfsops.c +++ b/module/os/linux/zfs/zfs_vfsops.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/module/zfs/spa.c b/module/zfs/spa.c index b2b59af429..eeec3b6be9 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include diff --git a/module/zfs/spa_boot.c b/module/zfs/spa_boot.c deleted file mode 100644 index fddb5c3c96..0000000000 --- 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 -#include -#include - -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 */