From patchwork Fri Dec 15 22:03:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 10116645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59E1B60231 for ; Fri, 15 Dec 2017 22:38:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C3D829F43 for ; Fri, 15 Dec 2017 22:38:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40AA12A121; Fri, 15 Dec 2017 22:38:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E020529F43 for ; Fri, 15 Dec 2017 22:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932317AbdLOWiP (ORCPT ); Fri, 15 Dec 2017 17:38:15 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:51172 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756434AbdLOWFT (ORCPT ); Fri, 15 Dec 2017 17:05:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=O+4Jh5R3az48312PIFKxIQgSYH7Dwg7XBOxSPyJ9HsA=; b=Qji3TNawRB/Ox5E4EQnGuY7I7 91NFiPgW2xLeQrN+5YAfQJpq9yOlA7xzaNboTiTRmISaVzTkOx3Yt7b6Pa4YEtHDONOcjlIdn+R60 zFkiFsZiaj45DijWD7//QLmmoBG+2uRKSNc5gLo2xdHaxpACLiVIJupTXGB+iVgoGgT8XSEkG1Spe WDD7gJepHlmHH8PeDvOvxI6/xc+IeF7sr17YiJdghYhWmzne9+7MggsokC1i6PWNOoWNBYlk77N2B OIM+xv8Qp45jjnnJMVv6LIm4T60SoYjQgXkzupskQj337zPQj1Xj5vNC89aI3GRQBFxVMpl9TKZ1p dYVAfmTtA==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1ePy6G-00026E-0v; Fri, 15 Dec 2017 22:05:00 +0000 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Ross Zwisler , David Howells , Shaohua Li , Jens Axboe , Rehas Sachdeva , Marc Zyngier , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-usb@vger.kernel.org, linux-raid@vger.kernel.org Subject: [PATCH v5 17/78] xarray: Add xa_destroy Date: Fri, 15 Dec 2017 14:03:49 -0800 Message-Id: <20171215220450.7899-18-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171215220450.7899-1-willy@infradead.org> References: <20171215220450.7899-1-willy@infradead.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox This function frees all the internal memory allocated to the xarray and reinitialises it to be empty. Signed-off-by: Matthew Wilcox --- include/linux/xarray.h | 1 + lib/xarray.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 1367d694eebd..fea81383a301 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -77,6 +77,7 @@ 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, void *old, void *entry, gfp_t); +void xa_destroy(struct xarray *); /** * xa_erase() - Erase this entry from the XArray. diff --git a/lib/xarray.c b/lib/xarray.c index e73ae7b57fc9..a51fa1e1f74f 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1418,6 +1418,31 @@ int xa_get_tagged(struct xarray *xa, void **dst, unsigned long start, } EXPORT_SYMBOL(xa_get_tagged); +/** + * xa_destroy() - Free all internal data structures. + * @xa: XArray. + * + * After calling this function, the XArray is empty and has freed all memory + * allocated for its internal data structures. You are responsible for + * freeing the objects referenced by the XArray. + */ +void xa_destroy(struct xarray *xa) +{ + XA_STATE(xas, xa, 0); + void *entry; + + xas.xa_node = NULL; + xa_lock(xa); + entry = xa_head_locked(xa); + RCU_INIT_POINTER(xa->xa_head, NULL); + xas_init_tags(&xas); + /* lockdep checks we're still holding the lock in xas_free_nodes() */ + if (xa_is_node(entry)) + xas_free_nodes(&xas, xa_to_node(entry)); + xa_unlock(xa); +} +EXPORT_SYMBOL(xa_destroy); + #ifdef XA_DEBUG void xa_dump_node(const struct xa_node *node) {