Skip to content

Commit 48b1320

Browse files
committed
Merge tag 'for-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba: "One bug fix and two build warning fixes: - call proper end bio callback for metadata RAID0 in a rare case of an unaligned block - fix uninitialized variable (reported by gcc 10.2) - fix warning about potential access beyond array bounds on mips64 with 64k pages (runtime check would not allow that)" * tag 'for-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: fix csum_tree_block page iteration to avoid tripping on -Werror=array-bounds btrfs: fix an uninitialized variable warning in btrfs_log_inode btrfs: call btrfs_orig_bbio_end_io in btrfs_end_bio_work
2 parents afead42 + 5ad9b47 commit 48b1320

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/btrfs/bio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static void btrfs_end_bio_work(struct work_struct *work)
330330
if (bbio->inode && !(bbio->bio.bi_opf & REQ_META))
331331
btrfs_check_read_bio(bbio, bbio->bio.bi_private);
332332
else
333-
bbio->end_io(bbio);
333+
btrfs_orig_bbio_end_io(bbio);
334334
}
335335

336336
static void btrfs_simple_end_io(struct bio *bio)

fs/btrfs/disk-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static void csum_tree_block(struct extent_buffer *buf, u8 *result)
9696
crypto_shash_update(shash, kaddr + BTRFS_CSUM_SIZE,
9797
first_page_part - BTRFS_CSUM_SIZE);
9898

99-
for (i = 1; i < num_pages; i++) {
99+
for (i = 1; i < num_pages && INLINE_EXTENT_BUFFER_PAGES > 1; i++) {
100100
kaddr = page_address(buf->pages[i]);
101101
crypto_shash_update(shash, kaddr, PAGE_SIZE);
102102
}

fs/btrfs/tree-log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6158,7 +6158,7 @@ static int log_delayed_deletions_incremental(struct btrfs_trans_handle *trans,
61586158
{
61596159
struct btrfs_root *log = inode->root->log_root;
61606160
const struct btrfs_delayed_item *curr;
6161-
u64 last_range_start;
6161+
u64 last_range_start = 0;
61626162
u64 last_range_end = 0;
61636163
struct btrfs_key key;
61646164

0 commit comments

Comments
 (0)