From patchwork Fri Feb 5 01:22:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 8229881 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 6EDAE9F6DA for ; Fri, 5 Feb 2016 01:26:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 561AB2038E for ; Fri, 5 Feb 2016 01:26:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B7B42017E for ; Fri, 5 Feb 2016 01:26:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbcBEB0j (ORCPT ); Thu, 4 Feb 2016 20:26:39 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:27258 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751496AbcBEBZB (ORCPT ); Thu, 4 Feb 2016 20:25:01 -0500 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="314600" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 05 Feb 2016 09:24:46 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id 37C594056413; Fri, 5 Feb 2016 09:24:41 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: Wang Xiaoguang Subject: [PATCH v6 13/19] btrfs: dedup: Add support to delete hash for on-disk backend Date: Fri, 5 Feb 2016 09:22:33 +0800 Message-Id: <1454635359-10013-14-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454635359-10013-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1454635359-10013-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: 37C594056413.A9840 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-7.4 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 Now on-disk backend can delete hash now. Signed-off-by: Wang Xiaoguang Signed-off-by: Qu Wenruo --- fs/btrfs/dedup.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/fs/btrfs/dedup.c b/fs/btrfs/dedup.c index 61a5d7a..59b32a5 100644 --- a/fs/btrfs/dedup.c +++ b/fs/btrfs/dedup.c @@ -467,6 +467,104 @@ static int inmem_del(struct btrfs_dedup_info *dedup_info, u64 bytenr) return 0; } +/* + * If prepare_del is given, this will setup search_slot() for delete. + * Caller needs to do proper locking. + * + * Return > 0 for found. + * Return 0 for not found. + * Return < 0 for error. + */ +static int ondisk_search_bytenr(struct btrfs_trans_handle *trans, + struct btrfs_dedup_info *dedup_info, + struct btrfs_path *path, u64 bytenr, + int prepare_del) +{ + struct btrfs_key key; + struct btrfs_root *dedup_root = dedup_info->dedup_root; + int ret; + int ins_len = 0; + int cow = 0; + + if (prepare_del) { + if (WARN_ON(trans == NULL)) + return -EINVAL; + cow = 1; + ins_len = -1; + } + + key.objectid = bytenr; + key.type = BTRFS_DEDUP_BYTENR_ITEM_KEY; + key.offset = (u64)-1; + + ret = btrfs_search_slot(trans, dedup_root, &key, path, + ins_len, cow); + + if (ret < 0) + return ret; + /* + * Although it's almost impossible, it's still possible that + * the last 64bits are all 1. + */ + if (ret == 0) + return 1; + + ret = btrfs_previous_item(dedup_root, path, bytenr, + BTRFS_DEDUP_BYTENR_ITEM_KEY); + if (ret < 0) + return ret; + if (ret > 0) + return 0; + return 1; +} + +static int ondisk_del(struct btrfs_trans_handle *trans, + struct btrfs_dedup_info *dedup_info, u64 bytenr) +{ + struct btrfs_root *dedup_root = dedup_info->dedup_root; + struct btrfs_path *path; + struct btrfs_key key; + int ret; + + path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; + + key.objectid = bytenr; + key.type = BTRFS_DEDUP_BYTENR_ITEM_KEY; + key.offset = 0; + + mutex_lock(&dedup_info->lock); + + ret = ondisk_search_bytenr(trans, dedup_info, path, bytenr, 1); + if (ret <= 0) + goto out; + + btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]); + ret = btrfs_del_item(trans, dedup_root, path); + btrfs_release_path(path); + if (ret < 0) + goto out; + /* Search for hash item and delete it */ + key.objectid = key.offset; + key.type = BTRFS_DEDUP_HASH_ITEM_KEY; + key.offset = bytenr; + + ret = btrfs_search_slot(trans, dedup_root, &key, path, -1, 1); + if (WARN_ON(ret > 0)) { + ret = -ENOENT; + goto out; + } + if (ret < 0) + goto out; + ret = btrfs_del_item(trans, dedup_root, path); + +out: + btrfs_free_path(path); + mutex_unlock(&dedup_info->lock); + return ret; +} + /* Remove a dedup hash from dedup tree */ int btrfs_dedup_del(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 bytenr) @@ -481,6 +579,8 @@ int btrfs_dedup_del(struct btrfs_trans_handle *trans, if (dedup_info->backend == BTRFS_DEDUP_BACKEND_INMEMORY) return inmem_del(dedup_info, bytenr); + if (dedup_info->backend == BTRFS_DEDUP_BACKEND_ONDISK) + return ondisk_del(trans, dedup_info, bytenr); return -EINVAL; }