Commit 48b1320a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents afead42f 5ad9b471

fs/btrfs/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static void btrfs_end_bio_work(struct work_struct *work) 
	if (bbio->inode && !(bbio->bio.bi_opf & REQ_META))

		btrfs_check_read_bio(bbio, bbio->bio.bi_private);

	else

		bbio->end_io(bbio);

		btrfs_orig_bbio_end_io(bbio);

}



static void btrfs_simple_end_io(struct bio *bio)

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void csum_tree_block(struct extent_buffer *buf, u8 *result) 
	crypto_shash_update(shash, kaddr + BTRFS_CSUM_SIZE,

			    first_page_part - BTRFS_CSUM_SIZE);



	for (i = 1; i < num_pages; i++) {

	for (i = 1; i < num_pages && INLINE_EXTENT_BUFFER_PAGES > 1; i++) {

		kaddr = page_address(buf->pages[i]);

		crypto_shash_update(shash, kaddr, PAGE_SIZE);

	}

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -6158,7 +6158,7 @@ static int log_delayed_deletions_incremental(struct btrfs_trans_handle *trans, 
{

	struct btrfs_root *log = inode->root->log_root;

	const struct btrfs_delayed_item *curr;

	u64 last_range_start;

	u64 last_range_start = 0;

	u64 last_range_end = 0;

	struct btrfs_key key;