Commit 26cd9474 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "We've collected some fixes in since the pre-merge window freeze.

  There's technically only one regression fix for 4.15, but the rest
  seems important and candidates for stable.

   - fix missing flush bio puts in error cases (is serious, but rarely
     happens)

   - fix reporting stat::st_blocks for buffered append writes

   - fix space cache invalidation

   - fix out of bound memory access when setting zlib level

   - fix potential memory corruption when fsync fails in the middle

   - fix crash in integrity checker

   - incremetnal send fix, path mixup for certain unlink/rename
     combination

   - pass flags to writeback so compressed writes can be throttled
     properly

   - error handling fixes"

* tag 'for-4.15-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: incremental send, fix wrong unlink path after renaming file
  btrfs: tree-checker: Fix false panic for sanity test
  Btrfs: fix list_add corruption and soft lockups in fsync
  btrfs: Fix wild memory access in compression level parser
  btrfs: fix deadlock when writing out space cache
  btrfs: clear space cache inode generation always
  Btrfs: fix reported number of inode blocks after buffered append writes
  Btrfs: move definition of the function btrfs_find_new_delalloc_bytes
  Btrfs: bail out gracefully rather than BUG_ON
  btrfs: dev_alloc_list is not protected by RCU, use normal list_del
  btrfs: add missing device::flush_bio puts
  btrfs: Fix transaction abort during failure in btrfs_rm_dev_item
  Btrfs: add write_flags for compression bio
parents 198e0c0c ea37d599

fs/btrfs/compression.c

+5 −4
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
				 unsigned long len, u64 disk_start,

				 unsigned long compressed_len,

				 struct page **compressed_pages,

				 unsigned long nr_pages)

				 unsigned long nr_pages,

				 unsigned int write_flags)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct bio *bio = NULL;
@@ -327,7 +328,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	bdev = fs_info->fs_devices->latest_bdev;



	bio = btrfs_bio_alloc(bdev, first_byte);

	bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

	bio->bi_opf = REQ_OP_WRITE | write_flags;

	bio->bi_private = cb;

	bio->bi_end_io = end_compressed_bio_write;

	refcount_set(&cb->pending_bios, 1);
@@ -374,7 +375,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			bio_put(bio);



			bio = btrfs_bio_alloc(bdev, first_byte);

			bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

			bio->bi_opf = REQ_OP_WRITE | write_flags;

			bio->bi_private = cb;

			bio->bi_end_io = end_compressed_bio_write;

			bio_add_page(bio, page, PAGE_SIZE, 0);
@@ -1528,5 +1529,5 @@ unsigned int btrfs_compress_str2level(const char *str) 
	if (str[4] == ':' && '1' <= str[5] && str[5] <= '9' && str[6] == 0)

		return str[5] - '0';



	return 0;

	return BTRFS_ZLIB_DEFAULT_LEVEL;

}

fs/btrfs/compression.h

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
/* Maximum size of data before compression */

#define BTRFS_MAX_UNCOMPRESSED		(SZ_128K)



#define	BTRFS_ZLIB_DEFAULT_LEVEL		3



struct compressed_bio {

	/* number of bios pending for this compressed extent */

	refcount_t pending_bios;
@@ -91,7 +93,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
				  unsigned long len, u64 disk_start,

				  unsigned long compressed_len,

				  struct page **compressed_pages,

				  unsigned long nr_pages);

				  unsigned long nr_pages,

				  unsigned int write_flags);

blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,

				 int mirror_num, unsigned long bio_flags);

fs/btrfs/ctree.h

+1 −0
Original line number Diff line number Diff line
@@ -3180,6 +3180,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput); 
int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput,

			       int nr);

int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,

			      unsigned int extra_bits,

			      struct extent_state **cached_state, int dedupe);

int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,

			     struct btrfs_root *new_root,

fs/btrfs/disk-io.c

+8 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, 
	 * that we don't try and read the other copies of this block, just

	 * return -EIO.

	 */

	if (found_level == 0 && btrfs_check_leaf(root, eb)) {

	if (found_level == 0 && btrfs_check_leaf_full(root, eb)) {

		set_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);

		ret = -EIO;

	}
@@ -3848,7 +3848,13 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf) 
					 buf->len,

					 fs_info->dirty_metadata_batch);

#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

	if (btrfs_header_level(buf) == 0 && btrfs_check_leaf(root, buf)) {

	/*

	 * Since btrfs_mark_buffer_dirty() can be called with item pointer set

	 * but item data not updated.

	 * So here we should only check item pointers, not item data.

	 */

	if (btrfs_header_level(buf) == 0 &&

	    btrfs_check_leaf_relaxed(root, buf)) {

		btrfs_print_leaf(buf);

		ASSERT(0);

	}

fs/btrfs/extent-tree.c

+7 −7
Original line number Diff line number Diff line
@@ -3502,13 +3502,6 @@ again: 
		goto again;

	}



	/* We've already setup this transaction, go ahead and exit */

	if (block_group->cache_generation == trans->transid &&

	    i_size_read(inode)) {

		dcs = BTRFS_DC_SETUP;

		goto out_put;

	}



	/*

	 * We want to set the generation to 0, that way if anything goes wrong

	 * from here on out we know not to trust this cache when we load up next
@@ -3532,6 +3525,13 @@ again: 
	}

	WARN_ON(ret);



	/* We've already setup this transaction, go ahead and exit */

	if (block_group->cache_generation == trans->transid &&

	    i_size_read(inode)) {

		dcs = BTRFS_DC_SETUP;

		goto out_put;

	}



	if (i_size_read(inode) > 0) {

		ret = btrfs_check_trunc_cache_free_space(fs_info,

					&fs_info->global_block_rsv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE