From patchwork Thu Jan 7 01:08:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 7972591 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2B5369F744 for ; Thu, 7 Jan 2016 01:08:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BF4620138 for ; Thu, 7 Jan 2016 01:08:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44B2A2014A for ; Thu, 7 Jan 2016 01:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbcAGBIn (ORCPT ); Wed, 6 Jan 2016 20:08:43 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:43542 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752278AbcAGBIl (ORCPT ); Wed, 6 Jan 2016 20:08:41 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="2301719" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 07 Jan 2016 09:08:40 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 7B649409257F for ; Thu, 7 Jan 2016 09:08:21 +0800 (CST) Received: from localhost.localdomain (10.167.226.34) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 7 Jan 2016 09:08:20 +0800 From: Qu Wenruo To: CC: Wang Xiaoguang Subject: [PATCH v3 04/16] btrfs: dedup: Introduce function to remove hash from in-memory tree Date: Thu, 7 Jan 2016 09:08:05 +0800 Message-ID: <1452128897-5433-5-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452128897-5433-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1452128897-5433-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.34] X-yoursite-MailScanner-ID: 7B649409257F.ACA36 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wang Xiaoguang Introduce static function inmem_del() to remove hash from in-memory dedup tree. And implement btrfs_dedup_del() and btrfs_dedup_destroy() interfaces. Signed-off-by: Qu Wenruo Signed-off-by: Wang Xiaoguang --- v3: Use struct inmem_hash instead of btrfs_dedup_hash. --- fs/btrfs/dedup.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/fs/btrfs/dedup.c b/fs/btrfs/dedup.c index 279f50b..0272411 100644 --- a/fs/btrfs/dedup.c +++ b/fs/btrfs/dedup.c @@ -259,3 +259,80 @@ int btrfs_dedup_add(struct btrfs_trans_handle *trans, struct btrfs_root *root, return inmem_add(dedup_info, hash); return -EINVAL; } + +static struct inmem_hash * +inmem_search_bytenr(struct btrfs_dedup_info *dedup_info, u64 bytenr) +{ + struct rb_node **p = &dedup_info->bytenr_root.rb_node; + struct rb_node *parent = NULL; + struct inmem_hash *entry = NULL; + + while (*p) { + parent = *p; + entry = rb_entry(parent, struct inmem_hash, bytenr_node); + + if (bytenr < entry->bytenr) + p = &(*p)->rb_left; + else if (bytenr > entry->bytenr) + p = &(*p)->rb_right; + else + return entry; + } + + return NULL; +} + +/* Delete a hash from in-memory dedup tree */ +static int inmem_del(struct btrfs_dedup_info *dedup_info, u64 bytenr) +{ + struct inmem_hash *hash; + + spin_lock(&dedup_info->lock); + hash = inmem_search_bytenr(dedup_info, bytenr); + if (!hash) { + spin_unlock(&dedup_info->lock); + return 0; + } + + __inmem_del(dedup_info, hash); + spin_unlock(&dedup_info->lock); + return 0; +} + +/* Remove a dedup hash from dedup tree */ +int btrfs_dedup_del(struct btrfs_trans_handle *trans, struct btrfs_root *root, + u64 bytenr) +{ + struct btrfs_fs_info *fs_info = root->fs_info; + struct btrfs_dedup_info *dedup_info = fs_info->dedup_info; + + if (!dedup_info) + return 0; + + if (dedup_info->backend == BTRFS_DEDUP_BACKEND_INMEMORY) + return inmem_del(dedup_info, bytenr); + return -EINVAL; +} + +static void inmem_destroy(struct btrfs_fs_info *fs_info) +{ + struct inmem_hash *entry, *tmp; + struct btrfs_dedup_info *dedup_info = fs_info->dedup_info; + + spin_lock(&dedup_info->lock); + list_for_each_entry_safe(entry, tmp, &dedup_info->lru_list, lru_list) + __inmem_del(dedup_info, entry); + spin_unlock(&dedup_info->lock); +} + +int btrfs_dedup_disable(struct btrfs_fs_info *fs_info) +{ + struct btrfs_dedup_info *dedup_info = fs_info->dedup_info; + + if (!dedup_info) + return 0; + + if (dedup_info->backend == BTRFS_DEDUP_BACKEND_INMEMORY) + inmem_destroy(fs_info); + return 0; +}