From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cn.fujitsu.com ([59.151.112.132]:45782 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753248AbbL2ICg (ORCPT ); Tue, 29 Dec 2015 03:02:36 -0500 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 27D8C41890F8 for ; Tue, 29 Dec 2015 16:01:32 +0800 (CST) From: Qu Wenruo To: CC: Wang Xiaoguang Subject: [PATCH 12/14] btrfs: dedup: Add support for adding hash for on-disk backend Date: Tue, 29 Dec 2015 16:01:21 +0800 Message-ID: <1451376083-30474-13-git-send-email-quwenruo@cn.fujitsu.com> In-Reply-To: <1451376083-30474-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1451376083-30474-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-btrfs-owner@vger.kernel.org List-ID: Now on-disk backend can add hash now. Signed-off-by: Wang Xiaoguang Signed-off-by: Qu Wenruo --- fs/btrfs/dedup.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/fs/btrfs/dedup.c b/fs/btrfs/dedup.c index bebf180..82e21a6 100644 --- a/fs/btrfs/dedup.c +++ b/fs/btrfs/dedup.c @@ -227,6 +227,8 @@ out: return ret; } +static int ondisk_search_hash(struct btrfs_dedup_info *dedup_info, u8 *hash, + u64 *bytenr_ret, u64 *num_bytes_ret); static void inmem_destroy(struct btrfs_fs_info *fs_info); int btrfs_dedup_cleanup(struct btrfs_fs_info *fs_info) { @@ -343,6 +345,71 @@ out: return 0; } +static int ondisk_add(struct btrfs_trans_handle *trans, + struct btrfs_dedup_info *dedup_info, + struct btrfs_dedup_hash *hash) +{ + struct btrfs_path *path; + struct btrfs_root *dedup_root = dedup_info->dedup_root; + struct btrfs_key key; + struct btrfs_dedup_hash_item *hash_item; + u64 bytenr; + u64 num_bytes; + int hash_len = btrfs_dedup_sizes[dedup_info->hash_type]; + int ret; + + path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; + + mutex_lock(&dedup_info->ondisk_lock); + ret = ondisk_search_hash(dedup_info, hash->hash, &bytenr, &num_bytes); + if (ret < 0) + goto out; + /* Same hash found, don't re-add to save dedup tree space */ + if (ret > 0) { + ret = 0; + goto out; + } + + /* Insert hash->bytenr item */ + memcpy(&key.objectid, hash->hash + hash_len - 8, 8); + key.type = BTRFS_DEDUP_HASH_ITEM_KEY; + key.offset = hash->bytenr; + + ret = btrfs_insert_empty_item(trans, dedup_root, path, &key, + sizeof(*hash_item) + hash_len); + WARN_ON(ret == -EEXIST); + if (ret < 0) + goto out; + hash_item = btrfs_item_ptr(path->nodes[0], path->slots[0], + struct btrfs_dedup_hash_item); + btrfs_set_dedup_hash_len(path->nodes[0], hash_item, hash->num_bytes); + write_extent_buffer(path->nodes[0], hash->hash, + (unsigned long)(hash_item + 1), hash_len); + btrfs_mark_buffer_dirty(path->nodes[0]); + btrfs_release_path(path); + + /* Then bytenr->hash item */ + key.objectid = hash->bytenr; + key.type = BTRFS_DEDUP_BYTENR_ITEM_KEY; + memcpy(&key.offset, hash->hash + hash_len - 8, 8); + + ret = btrfs_insert_empty_item(trans, dedup_root, path, &key, hash_len); + WARN_ON(ret == -EEXIST); + if (ret < 0) + goto out; + write_extent_buffer(path->nodes[0], hash->hash, + btrfs_item_offset_nr(path->nodes[0], path->slots[0]), + hash_len); + btrfs_mark_buffer_dirty(path->nodes[0]); + +out: + mutex_unlock(&dedup_info->ondisk_lock); + btrfs_free_path(path); + return ret; +} + int btrfs_dedup_add(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_dedup_hash *hash) { @@ -357,6 +424,8 @@ int btrfs_dedup_add(struct btrfs_trans_handle *trans, struct btrfs_root *root, if (dedup_info->backend == BTRFS_DEDUP_BACKEND_INMEMORY) return inmem_add(dedup_info, hash); + if (dedup_info->backend == BTRFS_DEDUP_BACKEND_ONDISK) + return ondisk_add(trans, dedup_info, hash); return -EINVAL; } -- 2.6.4