From c6e6ef9bc217c9dbcaa92a0a16b656d75a30aac6 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 1 May 2009 09:10:46 -0700 Subject: [PATCH] --- yaml --- r: 144583 b: refs/heads/master c: 0f3d042ed2f934f149ccb78300454beaf0c1134b h: refs/heads/master i: 144581: 6a2a76cfe438c80cd173a15db6862b77cac050a5 144579: 97add3ae5a90d3202abbaf4c79c589a403c74275 144575: 5cac01f638025618f4286caac9c7c17978acd40d v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/x_tables.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 12a5708e5069..4310cb70656a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec581f6a42bbbea5271c66da9769a41b46c74e10 +refs/heads/master: 0f3d042ed2f934f149ccb78300454beaf0c1134b diff --git a/trunk/include/linux/netfilter/x_tables.h b/trunk/include/linux/netfilter/x_tables.h index 1b2e43502ef7..c9efe039dc57 100644 --- a/trunk/include/linux/netfilter/x_tables.h +++ b/trunk/include/linux/netfilter/x_tables.h @@ -472,7 +472,7 @@ static inline void xt_info_rdlock_bh(void) local_bh_disable(); lock = &__get_cpu_var(xt_info_locks); - if (!lock->readers++) + if (likely(!lock->readers++)) spin_lock(&lock->lock); } @@ -480,7 +480,7 @@ static inline void xt_info_rdunlock_bh(void) { struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); - if (!--lock->readers) + if (likely(!--lock->readers)) spin_unlock(&lock->lock); local_bh_enable(); }