diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c index f98973408..72754cd87 100644 --- a/fcst/ft_sess.c +++ b/fcst/ft_sess.c @@ -172,25 +172,6 @@ static u32 ft_sess_hash(u32 port_id) return hash_32(port_id, FT_SESS_HASH_BITS); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) && \ - ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \ - ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \ - !defined(CONFIG_SUSE_KERNEL) && \ - (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \ - (RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 6)) -/* - * See also commit 4b20db3 (kref: Implement kref_get_unless_zero v3 -- v3.8). - * See also commit e3a5505 in branch stable/linux-3.4.y (v3.4.41). - * See also commit 3fa8ee5 in branch stable/linux-3.2.y (v3.2.44). - */ -static inline int __must_check kref_get_unless_zero(struct kref *kref) -{ - return atomic_add_unless(&kref->refcount, 1, 0); -} -#endif - /* * Find session in local port. * Sessions and hash lists are RCU-protected. diff --git a/scst/include/backport.h b/scst/include/backport.h index 483bec926..1088dfaa6 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -325,6 +325,27 @@ enum umh_wait { }; #endif +/* */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) && \ + ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \ + ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \ + !defined(CONFIG_SUSE_KERNEL) && \ + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \ + (RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 6)) +/* + * See also commit 4b20db3 (kref: Implement kref_get_unless_zero v3 -- v3.8). + * See also commit e3a5505 in branch stable/linux-3.4.y (v3.4.41). + * See also commit 3fa8ee5 in branch stable/linux-3.2.y (v3.2.44). + */ +static inline int __must_check kref_get_unless_zero(struct kref *kref) +{ + return atomic_add_unless(&kref->refcount, 1, 0); +} +#endif + /* */ #ifndef __list_for_each