From: Nikolay Borisov <nborisov@suse.com>
To: Johannes Thumshirn <jthumshirn@suse.de>, David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH 03/17] btrfs: use btrfs_crc32c() instead of btrfs_extref_hash()
Date: Fri, 10 May 2019 16:03:07 +0300 [thread overview]
Message-ID: <4ec6e19d-7cd0-ab42-92b9-b6ce6ac940ce@suse.com> (raw)
In-Reply-To: <20190510111547.15310-4-jthumshirn@suse.de>
On 10.05.19 г. 14:15 ч., Johannes Thumshirn wrote:
> Like btrfs_crc32c() btrfs_extref_hash() is only a shim wrapper over the
> crc32c() library function. So we can just use btrfs_crc32c() instead of
> btrfs_extref_hash().
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
I agree with Chris' feedback on this and next patch, just drop them both.
> ---
> fs/btrfs/ctree.h | 9 ---------
> fs/btrfs/inode-item.c | 6 +++---
> fs/btrfs/tree-log.c | 6 +++---
> 3 files changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index d85541f13f65..a3479a4e4f4d 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -2659,15 +2659,6 @@ static inline u64 btrfs_name_hash(const char *name, int len)
> return crc32c((u32)~1, name, len);
> }
>
> -/*
> - * Figure the key offset of an extended inode ref
> - */
> -static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name,
> - int len)
> -{
> - return (u64) crc32c(parent_objectid, name, len);
> -}
> -
> static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)
> {
> return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&
> diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
> index 30d62ef918b9..d2b2a64a1553 100644
> --- a/fs/btrfs/inode-item.c
> +++ b/fs/btrfs/inode-item.c
> @@ -91,7 +91,7 @@ btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans,
>
> key.objectid = inode_objectid;
> key.type = BTRFS_INODE_EXTREF_KEY;
> - key.offset = btrfs_extref_hash(ref_objectid, name, name_len);
> + key.offset = (u64) btrfs_crc32c(ref_objectid, name, name_len);
>
> ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
> if (ret < 0)
> @@ -123,7 +123,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,
>
> key.objectid = inode_objectid;
> key.type = BTRFS_INODE_EXTREF_KEY;
> - key.offset = btrfs_extref_hash(ref_objectid, name, name_len);
> + key.offset = (u64) btrfs_crc32c(ref_objectid, name, name_len);
>
> path = btrfs_alloc_path();
> if (!path)
> @@ -272,7 +272,7 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,
>
> key.objectid = inode_objectid;
> key.type = BTRFS_INODE_EXTREF_KEY;
> - key.offset = btrfs_extref_hash(ref_objectid, name, name_len);
> + key.offset = (u64) btrfs_crc32c(ref_objectid, name, name_len);
>
> path = btrfs_alloc_path();
> if (!path)
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 6adcd8a2c5c7..f01c6e1a15ed 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -1111,7 +1111,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans,
>
> search_key.objectid = inode_objectid;
> search_key.type = BTRFS_INODE_EXTREF_KEY;
> - search_key.offset = btrfs_extref_hash(parent_objectid,
> + search_key.offset = (u64) btrfs_crc32c(parent_objectid,
> victim_name,
> victim_name_len);
> ret = 0;
> @@ -1323,7 +1323,7 @@ static int btrfs_inode_ref_exists(struct inode *inode, struct inode *dir,
> if (key.type == BTRFS_INODE_REF_KEY)
> key.offset = parent_id;
> else
> - key.offset = btrfs_extref_hash(parent_id, name, namelen);
> + key.offset = (u64) btrfs_crc32c(parent_id, name, namelen);
>
> ret = btrfs_search_slot(NULL, BTRFS_I(inode)->root, &key, path, 0, 0);
> if (ret < 0)
> @@ -1901,7 +1901,7 @@ static bool name_in_log_ref(struct btrfs_root *log_root,
> return true;
>
> search_key.type = BTRFS_INODE_EXTREF_KEY;
> - search_key.offset = btrfs_extref_hash(dirid, name, name_len);
> + search_key.offset = (u64) btrfs_crc32c(dirid, name, name_len);
> if (backref_in_log(log_root, &search_key, dirid, name, name_len))
> return true;
>
>
next prev parent reply other threads:[~2019-05-10 13:03 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 11:15 [PATCH 00/17] Add support for SHA-256 checksums Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 01/17] btrfs: use btrfs_csum_data() instead of directly calling crc32c Johannes Thumshirn
2019-05-10 16:16 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 02/17] btrfs: resurrect btrfs_crc32c() Johannes Thumshirn
2019-05-10 16:16 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 03/17] btrfs: use btrfs_crc32c() instead of btrfs_extref_hash() Johannes Thumshirn
2019-05-10 13:03 ` Nikolay Borisov [this message]
2019-05-10 11:15 ` [PATCH 04/17] btrfs: use btrfs_crc32c() instead of btrfs_name_hash() Johannes Thumshirn
2019-05-10 12:56 ` Chris Mason
2019-05-13 7:04 ` Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 05/17] btrfs: don't assume ordered sums to be 4 bytes Johannes Thumshirn
2019-05-10 13:25 ` Nikolay Borisov
2019-05-10 13:27 ` Nikolay Borisov
2019-05-13 7:06 ` Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 06/17] btrfs: dont assume compressed_bio " Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 07/17] btrfs: use btrfs_crc32c{,_final}() in for free space cache Johannes Thumshirn
2019-05-10 13:27 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 08/17] btrfs: format checksums according to type for printing Johannes Thumshirn
2019-05-10 13:28 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 09/17] btrfs: add common checksum type validation Johannes Thumshirn
2019-05-10 13:37 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 10/17] btrfs: check for supported superblock checksum type before checksum validation Johannes Thumshirn
2019-05-10 13:37 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 11/17] btrfs: Simplify btrfs_check_super_csum() and get rid of size assumptions Johannes Thumshirn
2019-05-10 13:41 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 12/17] btrfs: add boilerplate code for directly including the crypto framework Johannes Thumshirn
2019-05-10 16:28 ` Nikolay Borisov
2019-05-10 11:15 ` [PATCH 13/17] btrfs: pass in an fs_info to btrfs_csum_{data,final}() Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 14/17] btrfs: directly call into crypto framework for checsumming Johannes Thumshirn
2019-05-10 13:45 ` Chris Mason
2019-05-10 13:54 ` Chris Mason
2019-05-13 7:17 ` Johannes Thumshirn
2019-05-13 13:55 ` Chris Mason
2019-05-14 12:46 ` Johannes Thumshirn
2019-05-13 13:00 ` David Sterba
2019-05-13 13:01 ` Johannes Thumshirn
2019-05-13 14:30 ` David Sterba
2019-05-10 11:15 ` [PATCH 15/17] btrfs: remove assumption about csum type form btrfs_csum_{data,final}() Johannes Thumshirn
2019-05-13 12:56 ` David Sterba
2019-05-10 11:15 ` [PATCH 16/17] btrfs: remove assumption about csum type form btrfs_print_data_csum_error() Johannes Thumshirn
2019-05-10 11:15 ` [PATCH 17/17] btrfs: add sha256 as another checksum algorithm Johannes Thumshirn
2019-05-10 12:30 ` Nikolay Borisov
2019-05-13 7:11 ` Johannes Thumshirn
2019-05-13 12:54 ` David Sterba
2019-05-13 12:55 ` Johannes Thumshirn
2019-05-15 1:45 ` Jeff Mahoney
2019-05-13 12:55 ` David Sterba
2019-05-13 12:58 ` Johannes Thumshirn
2019-05-15 17:27 ` [PATCH 00/17] Add support for SHA-256 checksums David Sterba
2019-05-16 6:30 ` Paul Jones
2019-05-16 8:16 ` Nikolay Borisov
2019-05-16 8:20 ` Johannes Thumshirn
2019-05-17 18:36 ` Diego Calleja
2019-05-17 19:07 ` Johannes Thumshirn
2019-05-18 0:38 ` Adam Borowski
2019-05-20 7:47 ` Johannes Thumshirn
2019-05-20 11:34 ` Austin S. Hemmelgarn
2019-05-20 11:57 ` Johannes Thumshirn
2019-05-20 11:42 ` Austin S. Hemmelgarn
2019-05-30 12:21 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ec6e19d-7cd0-ab42-92b9-b6ce6ac940ce@suse.com \
--to=nborisov@suse.com \
--cc=dsterba@suse.com \
--cc=jthumshirn@suse.de \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).