From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764364AbcLTN6E (ORCPT ); Tue, 20 Dec 2016 08:58:04 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34798 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764278AbcLTN6A (ORCPT ); Tue, 20 Dec 2016 08:58:00 -0500 From: Geliang Tang To: Andrew Morton , John Stultz , Thomas Gleixner Cc: Geliang Tang , linux-kernel@vger.kernel.org Subject: [PATCH] timerqueue: use rb_entry_safe Date: Tue, 20 Dec 2016 21:57:44 +0800 Message-Id: <0d5cf199ac43792df0b6f7e2145545c30fa1dbbe.1482222135.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <1e433cd03b01a3e89a22de5aa160b3442ff0cf16.1482222608.git.geliangtang@gmail.com> References: <1e433cd03b01a3e89a22de5aa160b3442ff0cf16.1482222608.git.geliangtang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use rb_entry_safe() instead of open-coding it. Signed-off-by: Geliang Tang --- lib/timerqueue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/timerqueue.c b/lib/timerqueue.c index 782ae8c..3debca0 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c @@ -80,8 +80,7 @@ bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) if (head->next == node) { struct rb_node *rbn = rb_next(&node->node); - head->next = rbn ? - rb_entry(rbn, struct timerqueue_node, node) : NULL; + head->next = rb_entry_safe(rbn, struct timerqueue_node, node); } rb_erase(&node->node, &head->head); RB_CLEAR_NODE(&node->node); -- 2.9.3