From patchwork Sun Jun 17 01:59:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468377 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 C2634603B4 for ; Sun, 17 Jun 2018 02:05:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B299D28D41 for ; Sun, 17 Jun 2018 02:05:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A737E28D44; Sun, 17 Jun 2018 02:05:26 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37E1028D4E for ; Sun, 17 Jun 2018 02:05:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E34B6B02D2; Sat, 16 Jun 2018 22:02:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 993C86B02D4; Sat, 16 Jun 2018 22:02:52 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 833EF6B02D5; Sat, 16 Jun 2018 22:02:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 3B0E06B02D2 for ; Sat, 16 Jun 2018 22:02:52 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id p91-v6so7643186plb.12 for ; Sat, 16 Jun 2018 19:02:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=06qd/xlJg/OzH4I18kD3SK7TPii4ugk5m7Ua6YGXEhI=; b=Sm0gEzu9v4zS0yr2jL39qpveGVdvSdkui2TdNway7KFiW3lvNK4HlVjRKzDiwNzDHZ SZVNLV1Js8XjxJJTelIHaw6yFxXHzffSuzo8V0RoGjdxkW6GKRwi/yEi//BTGPZrlCXw vF+qfJfOZPA3E7EOln/FHPkrNvyj7BuH9kD+cT5RgRa37da/VSEO2K2bvbnqh0AgDncl I70t0Yivto0LElsoYM+Wqec75IxJaLsQ1A+fEpPVKuo+AhKmZGhA5PEZH7nw/9piPtfs ffDaUfxKIBDaIATE6jwEcC2aYgQxBL5h5dWmqnThnSe86PviLnkhzBHmTOTG8ktr8wkp FHeQ== X-Gm-Message-State: APt69E0umXKCE4H5ilPHbpuC7ioqmFwrvYclyYnJxDo7yVMBSuWO2BGv S03UJLtdrT5RhD1kYCoa3FXsnpf5qsd91XIpKTrCFL5vfHEyhDY+GYV+C/EI3g08vxxwhUOhKwk Xnd/ARkx2yZgzQyIbkT8MynvFBn4+M0UgC9KaaIMHSVXCY6rv9Oi3Y8cEGgLd+eDAhw== X-Received: by 2002:a62:a21b:: with SMTP id m27-v6mr8031599pff.248.1529200971917; Sat, 16 Jun 2018 19:02:51 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIComMkTEq+tKGXPAdLGboslyHcHqGwXu7IuyPsWPx0FMhASXfipL/NomlZhMaYwY1g/4lZ X-Received: by 2002:a62:a21b:: with SMTP id m27-v6mr8027070pff.248.1529200867775; Sat, 16 Jun 2018 19:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200867; cv=none; d=google.com; s=arc-20160816; b=IthZkKVe41BSs6BxONB+xdyvGZbl7xHyPLZZYFE9O4fnwAazkMic0rpf/UgPvXqAdY DNG2JKNbzw004nVHaEi5YyoAENVFWT4//XBj572FO9Dx9tVDB/O0rK6bm1s6Tk4IqtPz TP1cRQarGagVsilD3DZXY0Uv/3z5AcwUL0K4GW+SV3N1zs1IK/zMHBTpdZRFJyVFZtTp PoP569d0UtV5ifHVecXcsMGPKlyS9gclQ430sRPFpcQkNKDRapBNSH0a6UA0KddS/tZ3 nwL+9Lm7BJKlIQ9uvCfoMWpDMimnFYSYsWdIDgOER1UsPPqDnF4ZKCw9ApvFCY+AN/yn yVIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=06qd/xlJg/OzH4I18kD3SK7TPii4ugk5m7Ua6YGXEhI=; b=t706nS3Q2xzbFHgyUJq2vcLoD2QspMvfZyZ8OH60dWmqMh5IixfvlYwk7pd2+DkGRo ybNPQV74VV7wfSy93gipWDs8HiXt4xVLIrCCYgVMfCneNFU25/VzumoIxAKEiw7kpo7X UR/p66kyfR5DVRQlKEMqpLAO3In/xyG6DvN6HWKZCewZHglf1NqHJR5xgjon8XhKxiR3 Z03QwNCO+MxJXATtwRlaTeNFLDKU7M/QmKGpFtbs2YFa2w63zSYhwsL4eyMwBBQEr2gX mBHR3M+RupB3kDqQ/JdTD4yb+CTU/UYRG1bwq0xucWR3NavhT/FJmmvkbdgi1ZUa/uFC mqKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ZRmlSBK9; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f17-v6si9281658pgv.383.2018.06.16.19.01.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ZRmlSBK9; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org 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=06qd/xlJg/OzH4I18kD3SK7TPii4ugk5m7Ua6YGXEhI=; b=ZRmlSBK92lq0ByjszBgzabJBy aN+v+EI3JNlMVXilNUWIQFVrfnJW3WWV80YUVEOmF/MeDPK2aYwOmxGlpmgR0+CBwALn0TRsOSQgh YTgKc7CZvvGIwIDDu0udK860oheV4TKYTQnDcoNf33oPV0YMk9UgyVZLb3jQXD+4IRRf1Xu4hFtOC jUpEWOWfOkpnmczEkeOjirw7TGBaQAJa2U9NEV3kVWdiCcpRUpS3cx9Q3PWtu8r52SmaRSrIaWacN sKTeeRUK12AvQWdFXuJmVfN5VfAzTrrswe1Y05hw6yfj6JRdP5z/I9RX0W2HCPN/YR9KKqsof817B mpdXxOE4w==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUMzw-0001GW-Qs; Sun, 17 Jun 2018 02:00:56 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v14 15/74] xarray: Destroy an XArray Date: Sat, 16 Jun 2018 18:59:53 -0700 Message-Id: <20180617020052.4759-16-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-1-willy@infradead.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 6f398732b664..fa36a0670988 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -229,6 +229,7 @@ void *xa_find_after(struct xarray *xa, unsigned long *index, unsigned long max, xa_tag_t) __attribute__((nonnull(2))); unsigned int xa_extract(struct xarray *, void **dst, unsigned long start, unsigned long max, unsigned int n, xa_tag_t); +void xa_destroy(struct xarray *); /** * xa_init() - Initialise an empty XArray. diff --git a/lib/xarray.c b/lib/xarray.c index 1e15ead40d78..e90ba76404ae 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1493,6 +1493,34 @@ unsigned int xa_extract(struct xarray *xa, void **dst, unsigned long start, } EXPORT_SYMBOL(xa_extract); +/** + * 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. + * + * Context: Any context. Takes and releases the xa_lock, interrupt-safe. + */ +void xa_destroy(struct xarray *xa) +{ + XA_STATE(xas, xa, 0); + unsigned long flags; + void *entry; + + xas.xa_node = NULL; + xas_lock_irqsave(&xas, flags); + 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)); + xas_unlock_irqrestore(&xas, flags); +} +EXPORT_SYMBOL(xa_destroy); + #ifdef XA_DEBUG void xa_dump_node(const struct xa_node *node) {