From 83c623aa1a8895879f03f07b060e1c53a9757f71 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 20 Apr 2011 12:01:11 -0700 Subject: [PATCH] Linux 2.6.39 compat, DEFINE_SPINLOCK() This is a long over due compatibility change. Way, way, way back in 2007 there was a push to remove all consumers of SPIN_LOCK_UNLOCKED. Finally, in 2011 with 2.6.39 all the consumers have been updated and SPIN_LOCK_UNLOCKED was removed. It's about time we use the new API as well, this change does exactly that. DEFINE_SPINLOCK() was available as far back as 2.6.12 so there doesn't need to be any additional autoconf-foo for this change. --- module/spl/spl-atomic.c | 4 ++-- module/spl/spl-module.c | 2 +- module/spl/spl-vnode.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/spl/spl-atomic.c b/module/spl/spl-atomic.c index f2dd67384..e37b96907 100644 --- a/module/spl/spl-atomic.c +++ b/module/spl/spl-atomic.c @@ -34,8 +34,8 @@ #ifdef ATOMIC_SPINLOCK /* Global atomic lock declarations */ -spinlock_t atomic32_lock = SPIN_LOCK_UNLOCKED; -spinlock_t atomic64_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(atomic32_lock); +DEFINE_SPINLOCK(atomic64_lock); EXPORT_SYMBOL(atomic32_lock); EXPORT_SYMBOL(atomic64_lock); diff --git a/module/spl/spl-module.c b/module/spl/spl-module.c index 2c665b5d4..7a626ca71 100644 --- a/module/spl/spl-module.c +++ b/module/spl/spl-module.c @@ -33,7 +33,7 @@ #define SS_DEBUG_SUBSYS SS_MODULE -static spinlock_t dev_info_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(dev_info_lock); static LIST_HEAD(dev_info_list); static struct dev_info * diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c index 32ae4865d..1af9b2998 100644 --- a/module/spl/spl-vnode.c +++ b/module/spl/spl-vnode.c @@ -39,7 +39,7 @@ EXPORT_SYMBOL(rootdir); static spl_kmem_cache_t *vn_cache; static spl_kmem_cache_t *vn_file_cache; -static spinlock_t vn_file_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(vn_file_lock); static LIST_HEAD(vn_file_list); vtype_t