[PATCH] tasklets: simplify code in tasklet_action_common()

[Mingzhe Yang]

Use tasklet_is_disabled() to simplify the code in tasklet_action_common.

Signed-off-by: Mingzhe Yang <cainiao666999@xxxxxxxxx>
---
 include/linux/interrupt.h | 11 +++++++++++
 kernel/softirq.c          | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 4777850..b0fba4d 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -721,6 +721,17 @@ static inline void tasklet_enable(struct tasklet_struct *t)
 	atomic_dec(&t->count);
 }
 
+static inline bool tasklet_is_enabled(struct tasklet_struct *t)
+{
+	smp_rmb();
+	return !atomic_read(&t->count);
+}
+
+static inline bool tasklet_is_disabled(struct tasklet_struct *t)
+{
+	return !tasklet_is_enabled(t);
+}
+
 extern void tasklet_kill(struct tasklet_struct *t);
 extern void tasklet_init(struct tasklet_struct *t,
 			 void (*func)(unsigned long), unsigned long data);
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 4992853..ee36b15 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -778,16 +778,16 @@ static void tasklet_action_common(struct softirq_action *a,
 		list = list->next;
 
 		if (tasklet_trylock(t)) {
-			if (!atomic_read(&t->count)) {
-				if (tasklet_clear_sched(t)) {
-					if (t->use_callback)
-						t->callback(t);
-					else
-						t->func(t->data);
-				}
+			if (tasklet_is_disabled(t) || !tasklet_clear_sched(t)) {
 				tasklet_unlock(t);
 				continue;
 			}
+
+			if (t->use_callback)
+				t->callback(t);
+			else
+				t->func(t->data);
+
 			tasklet_unlock(t);
 		}
 
-- 
1.8.3.1