From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752261AbdKVVUf (ORCPT ); Wed, 22 Nov 2017 16:20:35 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:35105 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751755AbdKVVIS (ORCPT ); Wed, 22 Nov 2017 16:08:18 -0500 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox Subject: [PATCH 25/62] xarray: Add xa_init Date: Wed, 22 Nov 2017 13:07:02 -0800 Message-Id: <20171122210739.29916-26-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171122210739.29916-1-willy@infradead.org> References: <20171122210739.29916-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox For initialising xarrays in code rather than data. Signed-off-by: Matthew Wilcox --- include/linux/xarray.h | 13 +++++++++++++ lib/xarray.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 08ddad60a43d..19a3974fdc4f 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -81,6 +81,19 @@ struct xarray { #define DEFINE_XARRAY(name) struct xarray name = XARRAY_INIT(name) +void __xa_init(struct xarray *, gfp_t flags); + +/** + * xa_init() - Initialise an empty XArray. + * @xa: XArray. + * + * An empty XArray is full of NULL entries. + */ +static inline void xa_init(struct xarray *xa) +{ + __xa_init(xa, 0); +} + void *xa_load(struct xarray *, unsigned long index); void *xa_store(struct xarray *, unsigned long index, void *entry, gfp_t); void *xa_cmpxchg(struct xarray *, unsigned long index, diff --git a/lib/xarray.c b/lib/xarray.c index 5409048e8b44..59f45c07988f 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -868,6 +868,21 @@ void *xas_find(struct xarray *xa, struct xa_state *xas, unsigned long max) } EXPORT_SYMBOL_GPL(xas_find); +/** + * __xa_init() - Initialise an empty XArray + * @xa: XArray. + * @flags: XA_FLAG_ values + * + * An empty XArray is full of NULL pointers. + */ +void __xa_init(struct xarray *xa, gfp_t flags) +{ + spin_lock_init(&xa->xa_lock); + xa->xa_flags = flags; + xa->xa_head = NULL; +} +EXPORT_SYMBOL(__xa_init); + /** * xa_load() - Load an entry from an XArray. * @xa: XArray. -- 2.15.0