From 2ca6e880da4b1ccb53dd149fc99776eb0702e5a6 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Wed, 31 Dec 2025 20:40:24 +1100 Subject: [PATCH] spl: remove old atomic lock Long ago, SPL atomics were implemented as a global spinlock over conventional operations. In 5e9b5d832b (2009-10) they was converted to proper atomics, with the spinlock retained as a fallback. The switch to compile with the fallback was later removed in a91258913f (2018-05), but the code it enabled wasn't. So lets do that. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Rob Norris Closes #18117 --- module/Kbuild.in | 1 - module/os/linux/spl/spl-atomic.c | 36 -------------------------------- 2 files changed, 37 deletions(-) delete mode 100644 module/os/linux/spl/spl-atomic.c diff --git a/module/Kbuild.in b/module/Kbuild.in index 04bcdc9c0..cc1b9abeb 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in @@ -69,7 +69,6 @@ ccflags-$(CONFIG_SPARC64) += -Wno-unused-value obj-$(CONFIG_ZFS) := spl.o zfs.o SPL_OBJS := \ - spl-atomic.o \ spl-condvar.o \ spl-cred.o \ spl-err.o \ diff --git a/module/os/linux/spl/spl-atomic.c b/module/os/linux/spl/spl-atomic.c deleted file mode 100644 index b6d967108..000000000 --- a/module/os/linux/spl/spl-atomic.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. - * Copyright (C) 2007 The Regents of the University of California. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf . - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * - * The SPL is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * The SPL is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with the SPL. If not, see . - * - * Solaris Porting Layer (SPL) Atomic Implementation. - */ - -#include - -#ifdef ATOMIC_SPINLOCK -/* Global atomic lock declarations */ -DEFINE_SPINLOCK(atomic32_lock); -DEFINE_SPINLOCK(atomic64_lock); - -EXPORT_SYMBOL(atomic32_lock); -EXPORT_SYMBOL(atomic64_lock); -#endif /* ATOMIC_SPINLOCK */