From: David Sterba <dsterba@suse.cz>
To: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH 15/17] btrfs: remove assumption about csum type form btrfs_csum_{data,final}()
Date: Mon, 13 May 2019 14:56:49 +0200 [thread overview]
Message-ID: <20190513125649.GC20156@suse.cz> (raw)
In-Reply-To: <20190510111547.15310-16-jthumshirn@suse.de>
On Fri, May 10, 2019 at 01:15:45PM +0200, Johannes Thumshirn wrote:
> btrfs_csum_data() and btrfs_csum_final() still have assumptions on the
> checksums' type and size. Remove it so we can plumb in more types.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
> fs/btrfs/check-integrity.c | 6 ++---
> fs/btrfs/compression.c | 13 ++++++-----
> fs/btrfs/disk-io.c | 58 +++++++++++++++++++++++++---------------------
> fs/btrfs/disk-io.h | 6 ++---
> fs/btrfs/file-item.c | 13 +++++------
> fs/btrfs/inode.c | 18 +++++++-------
> fs/btrfs/scrub.c | 20 +++++++++-------
> 7 files changed, 72 insertions(+), 62 deletions(-)
>
> diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
> index 6aad0c3d197f..54c8a549b505 100644
> --- a/fs/btrfs/check-integrity.c
> +++ b/fs/btrfs/check-integrity.c
> @@ -1712,7 +1712,6 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state,
> struct btrfs_fs_info *fs_info = state->fs_info;
> struct btrfs_header *h;
> u8 csum[BTRFS_CSUM_SIZE];
> - u32 crc = ~(u32)0;
> unsigned int i;
>
> if (num_pages * PAGE_SIZE < state->metablock_size)
> @@ -1723,14 +1722,15 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state,
> if (memcmp(h->fsid, fs_info->fs_devices->fsid, BTRFS_FSID_SIZE))
> return 1;
>
> + memset(csum, 0xff, btrfs_super_csum_size(fs_info->super_copy));
This should be added to the csum API as eg. btrfs_csum_init and not
opencoded.
next prev parent reply other threads:[~2019-05-13 12:55 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
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 [this message]
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=20190513125649.GC20156@suse.cz \
--to=dsterba@suse.cz \
--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).