On 04/01/2016 02:35 AM, Qu Wenruo wrote:
Now on-disk backend can add hash now.Since all needed on-disk backend functions are added, also allow on-disk backend to be used, by changing DEDUPE_BACKEND_COUNT from 1(inmemory only) to 2 (inmemory + ondisk). Signed-off-by: Wang Xiaoguang <wangxg.f...@cn.fujitsu.com> Signed-off-by: Qu Wenruo <quwen...@cn.fujitsu.com> --- fs/btrfs/dedupe.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/dedupe.h | 3 +- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/dedupe.c b/fs/btrfs/dedupe.c index 7c5d58a..1f0178e 100644 --- a/fs/btrfs/dedupe.c +++ b/fs/btrfs/dedupe.c @@ -437,6 +437,87 @@ out: return 0; } +static int ondisk_search_bytenr(struct btrfs_trans_handle *trans, + struct btrfs_dedupe_info *dedupe_info, + struct btrfs_path *path, u64 bytenr, + int prepare_del); +static int ondisk_search_hash(struct btrfs_dedupe_info *dedupe_info, u8 *hash, + u64 *bytenr_ret, u32 *num_bytes_ret); +static int ondisk_add(struct btrfs_trans_handle *trans, + struct btrfs_dedupe_info *dedupe_info, + struct btrfs_dedupe_hash *hash) +{ + struct btrfs_path *path; + struct btrfs_root *dedupe_root = dedupe_info->dedupe_root; + struct btrfs_key key; + u64 hash_offset; + u64 bytenr; + u32 num_bytes; + int hash_len = btrfs_dedupe_sizes[dedupe_info->hash_type]; + int ret; + + if (WARN_ON(hash_len <= 8 || + !IS_ALIGNED(hash->bytenr, dedupe_root->sectorsize))) + return -EINVAL; + + path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; + + mutex_lock(&dedupe_info->lock); + + ret = ondisk_search_bytenr(NULL, dedupe_info, path, hash->bytenr, 0); + if (ret < 0) + goto out; + if (ret > 0) { + ret = 0; + goto out; + } + btrfs_release_path(path); + + ret = ondisk_search_hash(dedupe_info, hash->hash, &bytenr, &num_bytes); + if (ret < 0) + goto out; + /* Same hash found, don't re-add to save dedupe tree space */ + if (ret > 0) { + ret = 0; + goto out; + } + + /* Insert hash->bytenr item */ + memcpy(&key.objectid, hash->hash + hash_len - 8, 8);
No magic numbers please. Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
