Remove dead code

Delete unused functions.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10470

diff --git a/cmd/zpool/os/freebsd/zpool_vdev_os.c b/cmd/zpool/os/freebsd/zpool_vdev_os.c
index 4a8d9272d3093cbf3b05f4735c6c4e216e4de29b..7d48f61a0ee77f496ed3a02223ce65b544868492 100644 (file)
--- a/cmd/zpool/os/freebsd/zpool_vdev_os.c
+++ b/cmd/zpool/os/freebsd/zpool_vdev_os.c
@@ -101,13 +101,3 @@ check_sector_size_database(char *path, int *sector_size)
 {
        return (0);
 }
-
-void
-zpool_vdev_enable_file(struct stat64 *statbuf, boolean_t *wholedisk)
-{
-       if (S_ISCHR(statbuf->st_mode)) {
-               statbuf->st_mode &= ~S_IFCHR;
-               statbuf->st_mode |= S_IFBLK;
-               *wholedisk = B_FALSE;
-       }
-}

diff --git a/include/os/freebsd/spl/acl/acl_common.h b/include/os/freebsd/spl/acl/acl_common.h
index 00a2a9dfe73a39eb8e6fc54be61b7d831170d3ac..44f5bed592f6e4a828d199786b58d94a1eb50cc4 100644 (file)
--- a/include/os/freebsd/spl/acl/acl_common.h
+++ b/include/os/freebsd/spl/acl/acl_common.h
@@ -46,7 +46,6 @@ typedef struct trivial_acl {
 extern int acltrivial(const char *);
 extern void adjust_ace_pair(ace_t *pair, mode_t mode);
 extern void adjust_ace_pair_common(void *, size_t, size_t, mode_t);
-extern int ace_trivial(ace_t *acep, int aclcnt);
 extern int ace_trivial_common(void *, int,
     uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *,
     uint32_t *mask));

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 7d5567db4b231663f858ca10cabf03893b832143..969856cc855c614c27441d5ffbe59acfef6db8e7 100644 (file)
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -341,7 +341,6 @@ extern void cv_broadcast(kcondvar_t *cv);
  */
 extern kstat_t *kstat_create(const char *, int,
     const char *, const char *, uchar_t, ulong_t, uchar_t);
-extern void kstat_named_init(kstat_named_t *, const char *, uchar_t);
 extern void kstat_install(kstat_t *);
 extern void kstat_delete(kstat_t *);
 extern void kstat_waitq_enter(kstat_io_t *);

diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c
index 0965911cf0a62670d98996d417d4b9b5c83cd345..36074641dabd0c986b147f3d653e6edcf2e40002 100644 (file)
--- a/lib/libshare/libshare.c
+++ b/lib/libshare/libshare.c
@@ -767,11 +767,3 @@ sa_zfs_process_share(sa_handle_t handle, sa_group_t group, sa_share_t share,
        return (process_share(impl_handle, impl_share, mountpoint, NULL,
            proto, shareopts, NULL, dataset, B_FALSE));
 }
-
-void
-sa_update_sharetab_ts(sa_handle_t handle)
-{
-       sa_handle_impl_t impl_handle = (sa_handle_impl_t)handle;
-
-       update_sharetab(impl_handle);
-}

diff --git a/lib/libspl/asm-generic/atomic.c b/lib/libspl/asm-generic/atomic.c
index 03f8ddcfa8f9f391bc3a41895cbc6ca953aa8994..f03f93609a259f619b7e7765f881bb058c034453 100644 (file)
--- a/lib/libspl/asm-generic/atomic.c
+++ b/lib/libspl/asm-generic/atomic.c
@@ -48,7 +48,6 @@ pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
                VERIFY3S(pthread_mutex_unlock(&atomic_lock), ==, 0);    \
        }
 
-ATOMIC_INC(long, unsigned long)
 ATOMIC_INC(8, uint8_t)
 ATOMIC_INC(uchar, uchar_t)
 ATOMIC_INC(16, uint16_t)
@@ -67,7 +66,6 @@ ATOMIC_INC(64, uint64_t)
                VERIFY3S(pthread_mutex_unlock(&atomic_lock), ==, 0);    \
        }
 
-ATOMIC_DEC(long, unsigned long)
 ATOMIC_DEC(8, uint8_t)
 ATOMIC_DEC(uchar, uchar_t)
 ATOMIC_DEC(16, uint16_t)
@@ -180,7 +178,6 @@ ATOMIC_AND(64, uint64_t)
                return (rc);                                            \
        }
 
-ATOMIC_INC_NV(long, unsigned long)
 ATOMIC_INC_NV(8, uint8_t)
 ATOMIC_INC_NV(uchar, uchar_t)
 ATOMIC_INC_NV(16, uint16_t)
@@ -201,7 +198,6 @@ ATOMIC_INC_NV(64, uint64_t)
                return (rc);                                            \
        }
 
-ATOMIC_DEC_NV(long, unsigned long)
 ATOMIC_DEC_NV(8, uint8_t)
 ATOMIC_DEC_NV(uchar, uchar_t)
 ATOMIC_DEC_NV(16, uint16_t)
@@ -286,7 +282,6 @@ atomic_sub_ptr_nv(volatile void *target, ssize_t bits)
                return (rc);                                            \
        }
 
-ATOMIC_OR_NV(long, unsigned long)
 ATOMIC_OR_NV(8, uint8_t)
 ATOMIC_OR_NV(uchar, uchar_t)
 ATOMIC_OR_NV(16, uint16_t)
@@ -307,7 +302,6 @@ ATOMIC_OR_NV(64, uint64_t)
                return (rc);                                            \
        }
 
-ATOMIC_AND_NV(long, unsigned long)
 ATOMIC_AND_NV(8, uint8_t)
 ATOMIC_AND_NV(uchar, uchar_t)
 ATOMIC_AND_NV(16, uint16_t)
@@ -454,47 +448,3 @@ membar_consumer(void)
 {
        /* XXX - Implement me */
 }
-
-/* Legacy kernel interfaces; they will go away (eventually). */
-
-uint8_t
-cas8(uint8_t *target, uint8_t arg1, uint8_t arg2)
-{
-       return (atomic_cas_8(target, arg1, arg2));
-}
-
-uint32_t
-cas32(uint32_t *target, uint32_t arg1, uint32_t arg2)
-{
-       return (atomic_cas_32(target, arg1, arg2));
-}
-
-uint64_t
-cas64(uint64_t *target, uint64_t arg1, uint64_t arg2)
-{
-       return (atomic_cas_64(target, arg1, arg2));
-}
-
-ulong_t
-caslong(ulong_t *target, ulong_t arg1, ulong_t arg2)
-{
-       return (atomic_cas_ulong(target, arg1, arg2));
-}
-
-void *
-casptr(void *target, void *arg1, void *arg2)
-{
-       return (atomic_cas_ptr(target, arg1, arg2));
-}
-
-void
-atomic_and_long(ulong_t *target, ulong_t bits)
-{
-       return (atomic_and_ulong(target, bits));
-}
-
-void
-atomic_or_long(ulong_t *target, ulong_t bits)
-{
-       return (atomic_or_ulong(target, bits));
-}

diff --git a/lib/libtpool/thread_pool.c b/lib/libtpool/thread_pool.c
index 267fa834bd7220a2f517dbbda0fba8be9c9bd509..892beeffa5ae7a5a988ef90adf8d0884d8b8676a 100644 (file)
--- a/lib/libtpool/thread_pool.c
+++ b/lib/libtpool/thread_pool.c
@@ -597,56 +597,3 @@ tpool_member(tpool_t *tpool)
        pthread_mutex_unlock(&tpool->tp_mutex);
        return (0);
 }
-
-void
-postfork1_child_tpool(void)
-{
-       pthread_t my_tid = pthread_self();
-       tpool_t *tpool;
-       tpool_job_t *job;
-
-       /*
-        * All of the thread pool workers are gone, except possibly
-        * for the current thread, if it is a thread pool worker thread.
-        * Retain the thread pools, but make them all empty.  Whatever
-        * jobs were queued or running belong to the parent process.
-        */
-top:
-       if ((tpool = thread_pools) == NULL)
-               return;
-
-       do {
-               tpool_active_t *activep;
-
-               (void) pthread_mutex_init(&tpool->tp_mutex, NULL);
-               (void) pthread_cond_init(&tpool->tp_busycv, NULL);
-               (void) pthread_cond_init(&tpool->tp_workcv, NULL);
-               (void) pthread_cond_init(&tpool->tp_waitcv, NULL);
-               for (job = tpool->tp_head; job; job = tpool->tp_head) {
-                       tpool->tp_head = job->tpj_next;
-                       free(job);
-               }
-               tpool->tp_tail = NULL;
-               tpool->tp_njobs = 0;
-               for (activep = tpool->tp_active; activep;
-                   activep = activep->tpa_next) {
-                       if (activep->tpa_tid == my_tid) {
-                               activep->tpa_next = NULL;
-                               break;
-                       }
-               }
-               tpool->tp_idle = 0;
-               tpool->tp_current = 0;
-               if ((tpool->tp_active = activep) != NULL)
-                       tpool->tp_current = 1;
-               tpool->tp_flags &= ~TP_WAIT;
-               if (tpool->tp_flags & (TP_DESTROY | TP_ABANDON)) {
-                       tpool->tp_flags &= ~TP_DESTROY;
-                       tpool->tp_flags |= TP_ABANDON;
-                       if (tpool->tp_current == 0) {
-                               delete_pool(tpool);
-                               goto top;       /* start over */
-                       }
-               }
-       } while ((tpool = tpool->tp_forw) != thread_pools);
-}

diff --git a/lib/libzfs/os/freebsd/libzfs_compat.c b/lib/libzfs/os/freebsd/libzfs_compat.c
index 3344d0e3ddc5083098ab1dd6beeffd24d3f9ff09..5c3ccd28da3e5528320bc781e6580f83bc804e94 100644 (file)
--- a/lib/libzfs/os/freebsd/libzfs_compat.c
+++ b/lib/libzfs/os/freebsd/libzfs_compat.c
@@ -33,9 +33,6 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-int zfs_ioctl_version = ZFS_IOCVER_UNDEF;
-// static int zfs_spa_version = -1;
-
 void
 libzfs_set_pipe_max(int infd)
 {
@@ -173,38 +170,6 @@ execvpe(const char *name, char * const argv[], char * const envp[])
        return (execvPe(name, path, argv, envp));
 }
 
-#if 0
-/*
- * Get the SPA version
- */
-static int
-get_zfs_spa_version(void)
-{
-       size_t ver_size;
-       int ver = 0;
-
-       ver_size = sizeof (ver);
-       sysctlbyname("vfs.zfs.version.spa", &ver, &ver_size, NULL, 0);
-
-       return (ver);
-}
-#endif
-
-/*
- * Get zfs_ioctl_version
- */
-int
-get_zfs_ioctl_version(void)
-{
-       size_t ver_size;
-       int ver = ZFS_IOCVER_NONE;
-
-       ver_size = sizeof (ver);
-       sysctlbyname("vfs.zfs.version.ioctl", &ver, &ver_size, NULL, 0);
-
-       return (ver);
-}
-
 const char *
 libzfs_error_init(int error)
 {

diff --git a/lib/libzfs/os/freebsd/libzfs_zmount.c b/lib/libzfs/os/freebsd/libzfs_zmount.c
index c0951c314dedabf4e3c60de7edace49837e88111..c6415b8b80eb52b1dd3c1e37adc72e46a1717420 100644 (file)
--- a/lib/libzfs/os/freebsd/libzfs_zmount.c
+++ b/lib/libzfs/os/freebsd/libzfs_zmount.c
@@ -135,14 +135,3 @@ zfs_mount_delegation_check(void)
 {
        return (0);
 }
-
-/*
- * Check if we are doing an overlay mount.
- * Returns B_TRUE if the mount would overlay, otherwise B_FALSE.
- */
-boolean_t
-zfs_mount_overlay_check(const char *mountpoint)
-{
-       /* FreeBSD always allows overlay mounts. */
-       return (B_FALSE);
-}

diff --git a/module/icp/include/sys/bitmap.h b/module/icp/include/sys/bitmap.h
index b1f6823e61d4ba45e6328835b7b0fcb1256bf7b6..4e86ee70ed9e89c220362051f309526f9b371819 100644 (file)
--- a/module/icp/include/sys/bitmap.h
+++ b/module/icp/include/sys/bitmap.h
@@ -157,9 +157,9 @@ extern int  odd_parity(ulong_t);
  * to 0 otherwise.
  */
 #define        BT_ATOMIC_SET(bitmap, bitindex) \
-       { atomic_or_long(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); }
+       { atomic_or_ulong(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); }
 #define        BT_ATOMIC_CLEAR(bitmap, bitindex) \
-       { atomic_and_long(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); }
+       { atomic_and_ulong(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); }
 
 #define        BT_ATOMIC_SET_EXCL(bitmap, bitindex, result) \
        { result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)),    \

diff --git a/module/os/freebsd/spl/acl_common.c b/module/os/freebsd/spl/acl_common.c
index 8eea4695eb08ad049386b2cea8767df4c2b46886..ee89c8233edb576e62fe24f8c833e4e4c235d060 100644 (file)
--- a/module/os/freebsd/spl/acl_common.c
+++ b/module/os/freebsd/spl/acl_common.c
@@ -1707,25 +1707,3 @@ ace_trivial_common(void *acep, int aclcnt,
        }
        return (0);
 }
-
-uint64_t
-ace_walk(void *datap, uint64_t cookie, int aclcnt, uint16_t *flags,
-    uint16_t *type, uint32_t *mask)
-{
-       ace_t *acep = datap;
-
-       if (cookie >= aclcnt)
-               return (0);
-
-       *flags = acep[cookie].a_flags;
-       *type = acep[cookie].a_type;
-       *mask = acep[cookie++].a_access_mask;
-
-       return (cookie);
-}
-
-int
-ace_trivial(ace_t *acep, int aclcnt)
-{
-       return (ace_trivial_common(acep, aclcnt, ace_walk));
-}

diff --git a/module/os/freebsd/spl/spl_kstat.c b/module/os/freebsd/spl/spl_kstat.c
index 1b149a544840f3cfbf0c5e8b6afd8a7e6981636c..234b56a495649b9f66397e7063f48949c17c9649 100644 (file)
--- a/module/os/freebsd/spl/spl_kstat.c
+++ b/module/os/freebsd/spl/spl_kstat.c
@@ -287,22 +287,6 @@ kstat_delete(kstat_t *ksp)
        free(ksp, M_KSTAT);
 }
 
-void
-kstat_set_string(char *dst, const char *src)
-{
-
-       bzero(dst, KSTAT_STRLEN);
-       (void) strncpy(dst, src, KSTAT_STRLEN - 1);
-}
-
-void
-kstat_named_init(kstat_named_t *knp, const char *name, uchar_t data_type)
-{
-
-       kstat_set_string(knp->name, name);
-       knp->data_type = data_type;
-}
-
 void
 kstat_waitq_enter(kstat_io_t *kiop)
 {

diff --git a/module/os/linux/zfs/zfs_vnops.c b/module/os/linux/zfs/zfs_vnops.c
index acf3aca44f67eed43d2b3feb530b927cc4037ff7..20c2709c92bc47753c8d07774db031dd5167b34f 100644 (file)
--- a/module/os/linux/zfs/zfs_vnops.c
+++ b/module/os/linux/zfs/zfs_vnops.c
@@ -4562,25 +4562,6 @@ zfs_inactive(struct inode *ip)
                rw_exit(&zfsvfs->z_teardown_inactive_lock);
 }
 
-/*
- * Bounds-check the seek operation.
- *
- *     IN:     ip      - inode seeking within
- *             ooff    - old file offset
- *             noffp   - pointer to new file offset
- *
- *     RETURN: 0 if success
- *             EINVAL if new offset invalid
- */
-/* ARGSUSED */
-int
-zfs_seek(struct inode *ip, offset_t ooff, offset_t *noffp)
-{
-       if (S_ISDIR(ip->i_mode))
-               return (0);
-       return ((*noffp < 0 || *noffp > MAXOFFSET_T) ? EINVAL : 0);
-}
-
 /*
  * Fill pages with data from the disk.
  */

diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
index 12d448094d1f0b48df84aac69369a6fa66393cf1..d1ce86c89ba28b4a0772401bf73161675e74e273 100644 (file)
--- a/module/os/linux/zfs/zvol_os.c
+++ b/module/os/linux/zfs/zvol_os.c
@@ -713,12 +713,6 @@ zvol_find_by_dev(dev_t dev)
        return (NULL);
 }
 
-void
-zvol_validate_dev(zvol_state_t *zv)
-{
-       ASSERT3U(MINOR(zv->zv_zso->zvo_dev) & ZVOL_MINOR_MASK, ==, 0);
-}
-
 static struct kobject *
 zvol_probe(dev_t dev, int *part, void *arg)
 {

diff --git a/module/zfs/ddt.c b/module/zfs/ddt.c
index 33dad8bdfa07a4168fb3bde28a2898f3a0775c3a..b94a9f54ece37a5479523cf37c1e03d482162c1d 100644 (file)
--- a/module/zfs/ddt.c
+++ b/module/zfs/ddt.c
@@ -594,12 +594,6 @@ ddt_decompress(uchar_t *src, void *dst, size_t s_len, size_t d_len)
                byteswap_uint64_array(dst, d_len);
 }
 
-ddt_t *
-ddt_select_by_checksum(spa_t *spa, enum zio_checksum c)
-{
-       return (spa->spa_ddt[c]);
-}
-
 ddt_t *
 ddt_select(spa_t *spa, const blkptr_t *bp)
 {

diff --git a/module/zfs/zrlock.c b/module/zfs/zrlock.c
index 6deb25648032022eca012f75c24fed8f2af5102f..a4def60536227a11a89d10fa55580585c247a0e8 100644 (file)
--- a/module/zfs/zrlock.c
+++ b/module/zfs/zrlock.c
@@ -156,15 +156,6 @@ zrl_exit(zrlock_t *zrl)
        mutex_exit(&zrl->zr_mtx);
 }
 
-int
-zrl_refcount(zrlock_t *zrl)
-{
-       ASSERT3S(zrl->zr_refcount, >, ZRL_DESTROYED);
-
-       int n = (int)zrl->zr_refcount;
-       return (n <= 0 ? 0 : n);
-}
-
 int
 zrl_is_zero(zrlock_t *zrl)
 {

diff --git a/tests/zfs-tests/tests/functional/checksum/sha2_test.c b/tests/zfs-tests/tests/functional/checksum/sha2_test.c
index 25a8d2bf3652649693f37ae93d7591a0897bc748..5800002a6ef7bd64b5bc4a638c59b1628ffd5f56 100644 (file)
--- a/tests/zfs-tests/tests/functional/checksum/sha2_test.c
+++ b/tests/zfs-tests/tests/functional/checksum/sha2_test.c
@@ -172,20 +172,6 @@ const uint8_t      sha512_256_test_digests[][32] = {
        }
 };
 
-/*
- * Local reimplementation of cmn_err, since it's used in sha2.c.
- */
-/*ARGSUSED*/
-void
-cmn_err(int level, char *format, ...)
-{
-       va_list ap;
-       va_start(ap, format);
-       /* LINTED: E_SEC_PRINTF_VAR_FMT */
-       (void) vfprintf(stderr, format, ap);
-       va_end(ap);
-}
-
 int
 main(int argc, char *argv[])
 {