Commit e88c4cfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.9-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fixes from David Sterba:

 - fix information leak by the buffer returned from LOGICAL_INO ioctl

 - fix flipped condition in scrub when tracking sectors in zoned mode

 - fix calculation when dropping extent range

 - reinstate fallback to write uncompressed data in case of fragmented
   space that could not store the entire compressed chunk

 - minor fix to message formatting style to make it conforming to the
   commonly used style

* tag 'for-6.9-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix wrong block_start calculation for btrfs_drop_extent_map_range()
  btrfs: fix information leak in btrfs_ioctl_logical_to_ino()
  btrfs: fallback if compressed IO fails for ENOSPC
  btrfs: scrub: run relocation repair when/only needed
  btrfs: remove colon from messages with state
parents 9d1ddab2 fe1c6c7a

fs/btrfs/backref.c

+3 −9
Original line number Diff line number Diff line
@@ -2776,20 +2776,14 @@ struct btrfs_data_container *init_data_container(u32 total_bytes) 
	size_t alloc_bytes;



	alloc_bytes = max_t(size_t, total_bytes, sizeof(*data));

	data = kvmalloc(alloc_bytes, GFP_KERNEL);

	data = kvzalloc(alloc_bytes, GFP_KERNEL);

	if (!data)

		return ERR_PTR(-ENOMEM);



	if (total_bytes >= sizeof(*data)) {

	if (total_bytes >= sizeof(*data))

		data->bytes_left = total_bytes - sizeof(*data);

		data->bytes_missing = 0;

	} else {

	else

		data->bytes_missing = sizeof(*data) - total_bytes;

		data->bytes_left = 0;

	}



	data->elem_cnt = 0;

	data->elem_missed = 0;



	return data;

}

fs/btrfs/extent_map.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end, 
					split->block_len = em->block_len;

					split->orig_start = em->orig_start;

				} else {

					const u64 diff = start + len - em->start;

					const u64 diff = end - em->start;



					split->block_len = split->len;

					split->block_start += diff;

fs/btrfs/inode.c

+6 −7
Original line number Diff line number Diff line
@@ -1145,13 +1145,13 @@ static void submit_one_async_extent(struct async_chunk *async_chunk, 
				   0, *alloc_hint, &ins, 1, 1);

	if (ret) {

		/*

		 * Here we used to try again by going back to non-compressed

		 * path for ENOSPC.  But we can't reserve space even for

		 * compressed size, how could it work for uncompressed size

		 * which requires larger size?  So here we directly go error

		 * path.

		 * We can't reserve contiguous space for the compressed size.

		 * Unlikely, but it's possible that we could have enough

		 * non-contiguous space for the uncompressed size instead.  So

		 * fall back to uncompressed.

		 */

		goto out_free;

		submit_uncompressed_range(inode, async_extent, locked_page);

		goto done;

	}



	/* Here we're doing allocation and writeback of the compressed pages */
@@ -1203,7 +1203,6 @@ static void submit_one_async_extent(struct async_chunk *async_chunk, 
out_free_reserve:

	btrfs_dec_block_group_reservations(fs_info, ins.objectid);

	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);

out_free:

	mapping_set_error(inode->vfs_inode.i_mapping, -EIO);

	extent_clear_unlock_delalloc(inode, start, end,

				     NULL, EXTENT_LOCKED | EXTENT_DELALLOC |

fs/btrfs/messages.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#ifdef CONFIG_PRINTK



#define STATE_STRING_PREFACE	": state "

#define STATE_STRING_PREFACE	" state "

#define STATE_STRING_BUF_LEN	(sizeof(STATE_STRING_PREFACE) + BTRFS_FS_STATE_COUNT + 1)



/*

fs/btrfs/scrub.c

+9 −9
Original line number Diff line number Diff line
@@ -1012,6 +1012,7 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work) 
	struct btrfs_fs_info *fs_info = sctx->fs_info;

	int num_copies = btrfs_num_copies(fs_info, stripe->bg->start,

					  stripe->bg->length);

	unsigned long repaired;

	int mirror;

	int i;
@@ -1078,17 +1079,16 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work) 
	 * Submit the repaired sectors.  For zoned case, we cannot do repair

	 * in-place, but queue the bg to be relocated.

	 */

	bitmap_andnot(&repaired, &stripe->init_error_bitmap, &stripe->error_bitmap,

		      stripe->nr_sectors);

	if (!sctx->readonly && !bitmap_empty(&repaired, stripe->nr_sectors)) {

		if (btrfs_is_zoned(fs_info)) {

		if (!bitmap_empty(&stripe->error_bitmap, stripe->nr_sectors))

			btrfs_repair_one_zone(fs_info, sctx->stripes[0].bg->start);

	} else if (!sctx->readonly) {

		unsigned long repaired;



		bitmap_andnot(&repaired, &stripe->init_error_bitmap,

			      &stripe->error_bitmap, stripe->nr_sectors);

		} else {

			scrub_write_sectors(sctx, stripe, repaired, false);

			wait_scrub_stripe_io(stripe);

		}

	}



	scrub_stripe_report_errors(sctx, stripe);

	set_bit(SCRUB_STRIPE_FLAG_REPAIR_DONE, &stripe->state);