From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932773AbcECOZB (ORCPT ); Tue, 3 May 2016 10:25:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:38107 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755496AbcECOZA (ORCPT ); Tue, 3 May 2016 10:25:00 -0400 Date: Tue, 3 May 2016 16:24:54 +0200 From: Jan Kara To: Matthew Wilcox Cc: linux-kernel@vger.kernel.org, Andrew Morton , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Konstantin Khlebnikov , Kirill Shutemov , Jan Kara , Neil Brown , Ross Zwisler Subject: Re: [PATCH v2 01/29] radix-tree: Introduce radix_tree_empty Message-ID: <20160503142454.GE25436@quack2.suse.cz> References: <1460643410-30196-1-git-send-email-willy@linux.intel.com> <1460643410-30196-2-git-send-email-willy@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460643410-30196-2-git-send-email-willy@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu 14-04-16 10:16:22, Matthew Wilcox wrote: > The irqdomain code was checking for 0 or 1 entries, not 0 entries like > the comment said they were. Introduce a new helper that will actually > check for an empty tree. > > Signed-off-by: Matthew Wilcox > Reviewed-by: Ross Zwisler The patch looks good. You can add: Reviewed-by: Jan Kara Honza > --- > include/linux/radix-tree.h | 5 +++++ > kernel/irq/irqdomain.c | 7 +------ > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h > index 51a97ac..83f708e 100644 > --- a/include/linux/radix-tree.h > +++ b/include/linux/radix-tree.h > @@ -136,6 +136,11 @@ do { \ > (root)->rnode = NULL; \ > } while (0) > > +static inline bool radix_tree_empty(struct radix_tree_root *root) > +{ > + return root->rnode == NULL; > +} > + > /** > * Radix-tree synchronization > * > diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c > index 3a519a0..ba3f60d 100644 > --- a/kernel/irq/irqdomain.c > +++ b/kernel/irq/irqdomain.c > @@ -139,12 +139,7 @@ void irq_domain_remove(struct irq_domain *domain) > { > mutex_lock(&irq_domain_mutex); > > - /* > - * radix_tree_delete() takes care of destroying the root > - * node when all entries are removed. Shout if there are > - * any mappings left. > - */ > - WARN_ON(domain->revmap_tree.height); > + WARN_ON(!radix_tree_empty(&domain->revmap_tree)); > > list_del(&domain->link); > > -- > 2.8.0.rc3 > > -- Jan Kara SUSE Labs, CR From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 3 May 2016 16:24:54 +0200 From: Jan Kara To: Matthew Wilcox Cc: linux-kernel@vger.kernel.org, Andrew Morton , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Konstantin Khlebnikov , Kirill Shutemov , Jan Kara , Neil Brown , Ross Zwisler Subject: Re: [PATCH v2 01/29] radix-tree: Introduce radix_tree_empty Message-ID: <20160503142454.GE25436@quack2.suse.cz> References: <1460643410-30196-1-git-send-email-willy@linux.intel.com> <1460643410-30196-2-git-send-email-willy@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460643410-30196-2-git-send-email-willy@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: On Thu 14-04-16 10:16:22, Matthew Wilcox wrote: > The irqdomain code was checking for 0 or 1 entries, not 0 entries like > the comment said they were. Introduce a new helper that will actually > check for an empty tree. > > Signed-off-by: Matthew Wilcox > Reviewed-by: Ross Zwisler The patch looks good. You can add: Reviewed-by: Jan Kara Honza > --- > include/linux/radix-tree.h | 5 +++++ > kernel/irq/irqdomain.c | 7 +------ > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h > index 51a97ac..83f708e 100644 > --- a/include/linux/radix-tree.h > +++ b/include/linux/radix-tree.h > @@ -136,6 +136,11 @@ do { \ > (root)->rnode = NULL; \ > } while (0) > > +static inline bool radix_tree_empty(struct radix_tree_root *root) > +{ > + return root->rnode == NULL; > +} > + > /** > * Radix-tree synchronization > * > diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c > index 3a519a0..ba3f60d 100644 > --- a/kernel/irq/irqdomain.c > +++ b/kernel/irq/irqdomain.c > @@ -139,12 +139,7 @@ void irq_domain_remove(struct irq_domain *domain) > { > mutex_lock(&irq_domain_mutex); > > - /* > - * radix_tree_delete() takes care of destroying the root > - * node when all entries are removed. Shout if there are > - * any mappings left. > - */ > - WARN_ON(domain->revmap_tree.height); > + WARN_ON(!radix_tree_empty(&domain->revmap_tree)); > > list_del(&domain->link); > > -- > 2.8.0.rc3 > > -- Jan Kara SUSE Labs, CR -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org