Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934275AbaFJAxc (ORCPT ); Mon, 9 Jun 2014 20:53:32 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.229]:59896 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932881AbaFJAxb (ORCPT ); Mon, 9 Jun 2014 20:53:31 -0400 Date: Mon, 9 Jun 2014 20:53:29 -0400 From: Steven Rostedt To: Thomas Gleixner Cc: LKML , Peter Zijlstra , Ingo Molnar , Lai Jiangshan , Jason Low , Brad Mouring Subject: Re: [patch V3 4/7] rtmutex: Siplify remove_waiter() Message-ID: <20140609205329.52b8c0d5@gandalf.local.home> In-Reply-To: <20140609202336.248536613@linutronix.de> References: <20140609201118.387571774@linutronix.de> <20140609202336.248536613@linutronix.de> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 09 Jun 2014 20:28:08 -0000 Thomas Gleixner wrote: > Exit right away, when the removed waiter was not the top prioriy > waiter on the lock. Get rid of the extra indent level. > > Signed-off-by: Thomas Gleixner > --- > kernel/locking/rtmutex.c | 26 ++++++++++---------------- > 1 file changed, 10 insertions(+), 16 deletions(-) > > Index: tip/kernel/locking/rtmutex.c > =================================================================== > --- tip.orig/kernel/locking/rtmutex.c > +++ tip/kernel/locking/rtmutex.c > @@ -780,7 +780,7 @@ static void remove_waiter(struct rt_mute > { > int first = (waiter == rt_mutex_top_waiter(lock)); > struct task_struct *owner = rt_mutex_owner(lock); > - struct rt_mutex *next_lock = NULL; > + struct rt_mutex *next_lock; > unsigned long flags; > > raw_spin_lock_irqsave(¤t->pi_lock, flags); > @@ -788,28 +788,22 @@ static void remove_waiter(struct rt_mute > current->pi_blocked_on = NULL; > raw_spin_unlock_irqrestore(¤t->pi_lock, flags); > Add comment here, something like... /* * Only update priority if this task was the highest priority * task waiting on the lock, and there is an owner to update. */ Rest looks good. Reviewed-by: Steven Rostedt -- Steve > - if (!owner) > + if (!owner || !first) > return; > > - if (first) { > + raw_spin_lock_irqsave(&owner->pi_lock, flags); > > - raw_spin_lock_irqsave(&owner->pi_lock, flags); > + rt_mutex_dequeue_pi(owner, waiter); > > - rt_mutex_dequeue_pi(owner, waiter); > + if (rt_mutex_has_waiters(lock)) > + rt_mutex_enqueue_pi(owner, rt_mutex_top_waiter(lock)); > > - if (rt_mutex_has_waiters(lock)) { > - struct rt_mutex_waiter *next; > + __rt_mutex_adjust_prio(owner); > > - next = rt_mutex_top_waiter(lock); > - rt_mutex_enqueue_pi(owner, next); > - } > - __rt_mutex_adjust_prio(owner); > + /* Store the lock on which owner is blocked or NULL */ > + next_lock = task_blocked_on_lock(owner); > > - /* Store the lock on which owner is blocked or NULL */ > - next_lock = task_blocked_on_lock(owner); > - > - raw_spin_unlock_irqrestore(&owner->pi_lock, flags); > - } > + raw_spin_unlock_irqrestore(&owner->pi_lock, flags); > > if (!next_lock) > return; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/