From patchwork Thu Sep 15 11:54:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9333275 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 6CE886089F for ; Thu, 15 Sep 2016 11:56:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53B3829687 for ; Thu, 15 Sep 2016 11:56:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 486E72968B; Thu, 15 Sep 2016 11:56:22 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 8DA5D2968A for ; Thu, 15 Sep 2016 11:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934576AbcIOL4Q (ORCPT ); Thu, 15 Sep 2016 07:56:16 -0400 Received: from mga01.intel.com ([192.55.52.88]:25920 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934569AbcIOL4N (ORCPT ); Thu, 15 Sep 2016 07:56:13 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 15 Sep 2016 04:56:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,339,1470726000"; d="scan'208";a="1050744215" Received: from black.fi.intel.com ([10.237.72.56]) by orsmga002.jf.intel.com with ESMTP; 15 Sep 2016 04:56:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 44E9B58D; Thu, 15 Sep 2016 14:55:26 +0300 (EEST) From: "Kirill A. Shutemov" To: "Theodore Ts'o" , Andreas Dilger , Jan Kara , Andrew Morton Cc: Alexander Viro , Hugh Dickins , Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Matthew Wilcox , Ross Zwisler , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, "Kirill A . Shutemov" Subject: [PATCHv3 06/41] radix-tree: Handle multiorder entries being deleted by replace_clear_tags Date: Thu, 15 Sep 2016 14:54:48 +0300 Message-Id: <20160915115523.29737-7-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160915115523.29737-1-kirill.shutemov@linux.intel.com> References: <20160915115523.29737-1-kirill.shutemov@linux.intel.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox radix_tree_replace_clear_tags() can be called with NULL as the replacement value; in this case we need to delete sibling entries which point to the slot. Signed-off-by: Matthew Wilcox Signed-off-by: Kirill A. Shutemov --- lib/radix-tree.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/radix-tree.c b/lib/radix-tree.c index e58855435c01..57c15c4d0796 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -1805,17 +1805,23 @@ void *radix_tree_delete(struct radix_tree_root *root, unsigned long index) } EXPORT_SYMBOL(radix_tree_delete); +/* + * If the caller passes NULL for @entry, it must take care to adjust + * node->count. See page_cache_tree_delete() for an example. + */ struct radix_tree_node *radix_tree_replace_clear_tags( struct radix_tree_root *root, unsigned long index, void *entry) { struct radix_tree_node *node; void **slot; + unsigned int offset; __radix_tree_lookup(root, index, &node, &slot); if (node) { - unsigned int tag, offset = get_slot_offset(node, slot); + unsigned int tag; + offset = get_slot_offset(node, slot); for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++) node_tag_clear(root, node, tag, offset); } else { @@ -1824,6 +1830,9 @@ struct radix_tree_node *radix_tree_replace_clear_tags( } radix_tree_replace_slot(slot, entry); + if (!entry && node) + delete_sibling_entries(node, node_to_entry(slot), offset); + return node; }