From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
Chris Mason <clm@fb.com>, Richard Weinberger <richard@nod.at>,
David Gstir <david@sigma-star.at>,
Nikolay Borisov <nborisov@suse.com>
Subject: Re: [PATCH v2 04/13] btrfs: don't assume ordered sums to be 4 bytes
Date: Tue, 21 May 2019 15:10:30 +0200 [thread overview]
Message-ID: <20190521131030.GC7200@x250> (raw)
In-Reply-To: <20190516084803.9774-5-jthumshirn@suse.de>
On Thu, May 16, 2019 at 10:47:54AM +0200, Johannes Thumshirn wrote:
David can you fold this change in:
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 7281657c859c..ba2405b4931b 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -23,9 +23,13 @@
#define MAX_CSUM_ITEMS(r, size) (min_t(u32, __MAX_CSUM_ITEMS(r, size), \
PAGE_SIZE))
-#define MAX_ORDERED_SUM_BYTES(fs_info, csum_size) ((PAGE_SIZE - \
- sizeof(struct btrfs_ordered_sum)) / \
- (csum_size) * (fs_info)->sectorsize)
+static inline size_t max_ordered_sum_bytes(struct btrfs_fs_info *fs_info,
+ u16 csum_size)
+{
+ u32 ncsums = (PAGE_SIZE - sizeof(struct btrfs_ordered_sum)) / csum_size;
+
+ return ncsums * fs_info->sectorsize;
+}
int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
@@ -376,7 +380,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
struct btrfs_csum_item);
while (start < csum_end) {
size = min_t(size_t, csum_end - start,
- MAX_ORDERED_SUM_BYTES(fs_info, csum_size));
+ max_ordered_sum_bytes(fs_info, csum_size));
sums = kzalloc(btrfs_ordered_sum_size(fs_info, size),
GFP_NOFS);
if (!sums) {
--
Johannes Thumshirn SUSE Labs Filesystems
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
next prev parent reply other threads:[~2019-05-21 13:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 8:47 [PATCH v2 00/13] Add support for SHA-256 checksums Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 01/13] btrfs: use btrfs_csum_data() instead of directly calling crc32c Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 02/13] btrfs: resurrect btrfs_crc32c() Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 03/13] btrfs: use btrfs_crc32c{,_final}() in for free space cache Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 04/13] btrfs: don't assume ordered sums to be 4 bytes Johannes Thumshirn
2019-05-21 12:42 ` Nikolay Borisov
2019-05-21 13:10 ` Johannes Thumshirn [this message]
2019-05-21 13:14 ` Nikolay Borisov
2019-05-16 8:47 ` [PATCH v2 05/13] btrfs: dont assume compressed_bio " Johannes Thumshirn
2019-05-21 12:56 ` Nikolay Borisov
2019-05-21 13:00 ` Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 06/13] btrfs: format checksums according to type for printing Johannes Thumshirn
2019-05-16 8:47 ` [PATCH v2 07/13] btrfs: add common checksum type validation Johannes Thumshirn
2019-05-21 14:04 ` David Sterba
2019-05-16 8:47 ` [PATCH v2 08/13] btrfs: check for supported superblock checksum type before checksum validation Johannes Thumshirn
2019-05-21 12:58 ` Nikolay Borisov
2019-05-21 14:06 ` David Sterba
2019-05-16 8:47 ` [PATCH v2 09/13] btrfs: Simplify btrfs_check_super_csum() and get rid of size assumptions Johannes Thumshirn
2019-05-21 13:01 ` Nikolay Borisov
2019-05-21 13:23 ` Johannes Thumshirn
2019-05-16 8:48 ` [PATCH v2 10/13] btrfs: add boilerplate code for directly including the crypto framework Johannes Thumshirn
2019-05-21 14:11 ` David Sterba
2019-05-16 8:48 ` [PATCH v2 11/13] btrfs: directly call into crypto framework for checsumming Johannes Thumshirn
2019-05-21 14:22 ` David Sterba
2019-05-22 8:06 ` Johannes Thumshirn
2019-05-16 8:48 ` [PATCH v2 12/13] btrfs: remove assumption about csum type form btrfs_print_data_csum_error() Johannes Thumshirn
2019-05-21 13:02 ` Nikolay Borisov
2019-05-16 8:48 ` [PATCH v2 13/13] btrfs: add sha256 as another checksum algorithm Johannes Thumshirn
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=20190521131030.GC7200@x250 \
--to=jthumshirn@suse.de \
--cc=clm@fb.com \
--cc=david@sigma-star.at \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
--cc=richard@nod.at \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.