Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull btrfs updates from David Sterba:
 "Mostly fixes and cleanups, nothing big, though the notable thing is
  the inserted/deleted lines delta -1124.

  User visible changes:
   - allow defrag on opened read-only files that have rw permissions;
     similar to what dedupe will allow on such files

  Core changes:
   - tree checker improvements, reported by fuzzing:
      * more checks for: block group items, essential trees
      * chunk type validation
      * mount time cross-checks that physical and logical chunks match
      * switch more error codes to EUCLEAN aka EFSCORRUPTED

  Fixes:
   - fsync corner case fixes

   - fix send failure when root has deleted files still open

   - send, fix incorrect file layout after hole punching beyond eof

   - fix races between mount and deice scan ioctl, found by fuzzing

   - fix deadlock when delayed iput is called from writeback on the same
     inode; rare but has been observed in practice, also removes code

   - fix pinned byte accounting, using the right percpu helpers; this
     should avoid some write IO inefficiency during low space conditions

   - don't remove block group that still has pinned bytes

   - reset on-disk device stats value after replace, otherwise this
     would report stale values for the new device

  Cleanups:
   - time64_t/timespec64 cleanups

   - remove remaining dead code in scrub handling NOCOW extents after
     disabling it in previous cycle

   - simplify fsync regarding ordered extents logic and remove all the
     related code

   - remove redundant arguments in order to reduce stack space
     consumption

   - remove support for V0 type of extents, not in use since 2.6.30

   - remove several unused structure members

   - fewer indirect function calls by inlining some callbacks

   - qgroup rescan timing fixes

   - vfs: iget cleanups"

* tag 'for-4.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (182 commits)
  btrfs: revert fs_devices state on error of btrfs_init_new_device
  btrfs: Exit gracefully when chunk map cannot be inserted to the tree
  btrfs: Introduce mount time chunk <-> dev extent mapping check
  btrfs: Verify that every chunk has corresponding block group at mount time
  btrfs: Check that each block group has corresponding chunk at mount time
  Btrfs: send, fix incorrect file layout after hole punching beyond eof
  btrfs: Use wrapper macro for rcu string to remove duplicate code
  btrfs: simplify btrfs_iget
  btrfs: lift make_bad_inode into btrfs_iget
  btrfs: simplify IS_ERR/PTR_ERR checks
  btrfs: btrfs_iget never returns an is_bad_inode inode
  btrfs: replace: Reset on-disk dev stats value after replace
  btrfs: extent-tree: Remove unused __btrfs_free_block_rsv
  btrfs: backref: Use ERR_CAST to return error code
  btrfs: Remove redundant btrfs_release_path from btrfs_unlink_subvol
  btrfs: Remove root parameter from btrfs_unlink_subvol
  btrfs: Remove fs_info from btrfs_add_root_ref
  btrfs: Remove fs_info from btrfs_del_root_ref
  btrfs: Remove fs_info from btrfs_del_root
  btrfs: Remove fs_info from btrfs_delete_delayed_dir_index
  ...
parents 575b9438 39379faa

fs/btrfs/acl.c

+6 −7
Original line number Diff line number Diff line
@@ -30,23 +30,22 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		BUG();

		return ERR_PTR(-EINVAL);

	}



	size = btrfs_getxattr(inode, name, "", 0);

	size = btrfs_getxattr(inode, name, NULL, 0);

	if (size > 0) {

		value = kzalloc(size, GFP_KERNEL);

		if (!value)

			return ERR_PTR(-ENOMEM);

		size = btrfs_getxattr(inode, name, value, size);

	}

	if (size > 0) {

	if (size > 0)

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

	} else if (size == -ERANGE || size == -ENODATA || size == 0) {

	else if (size == -ENODATA || size == 0)

		acl = NULL;

	} else {

		acl = ERR_PTR(-EIO);

	}

	else

		acl = ERR_PTR(size);

	kfree(value);



	return acl;

fs/btrfs/backref.c

+3 −3
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static int add_inline_refs(const struct btrfs_fs_info *fs_info, 
		type = btrfs_get_extent_inline_ref_type(leaf, iref,

							BTRFS_REF_TYPE_ANY);

		if (type == BTRFS_REF_TYPE_INVALID)

			return -EINVAL;

			return -EUCLEAN;



		offset = btrfs_extent_inline_ref_offset(leaf, iref);
@@ -1793,7 +1793,7 @@ static int get_extent_inline_ref(unsigned long *ptr, 
	*out_type = btrfs_get_extent_inline_ref_type(eb, *out_eiref,

						     BTRFS_REF_TYPE_ANY);

	if (*out_type == BTRFS_REF_TYPE_INVALID)

		return -EINVAL;

		return -EUCLEAN;



	*ptr += btrfs_extent_inline_ref_size(*out_type);

	WARN_ON(*ptr > end);
@@ -2225,7 +2225,7 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, 


	fspath = init_data_container(total_bytes);

	if (IS_ERR(fspath))

		return (void *)fspath;

		return ERR_CAST(fspath);



	ifp = kmalloc(sizeof(*ifp), GFP_KERNEL);

	if (!ifp) {

fs/btrfs/btrfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ struct btrfs_inode { 
	struct btrfs_delayed_node *delayed_node;



	/* File creation time. */

	struct timespec i_otime;

	struct timespec64 i_otime;



	/* Hook into fs_info->delayed_iputs */

	struct list_head delayed_iput;

fs/btrfs/check-integrity.c

+7 −2
Original line number Diff line number Diff line
@@ -1539,7 +1539,12 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len, 
	}



	device = multi->stripes[0].dev;

	block_ctx_out->dev = btrfsic_dev_state_lookup(device->bdev->bd_dev);

	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state) ||

	    !device->bdev || !device->name)

		block_ctx_out->dev = NULL;

	else

		block_ctx_out->dev = btrfsic_dev_state_lookup(

							device->bdev->bd_dev);

	block_ctx_out->dev_bytenr = multi->stripes[0].physical;

	block_ctx_out->start = bytenr;

	block_ctx_out->len = len;
@@ -1624,7 +1629,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
		bio = btrfs_io_bio_alloc(num_pages - i);

		bio_set_dev(bio, block_ctx->dev->bdev);

		bio->bi_iter.bi_sector = dev_bytenr >> 9;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;



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

			ret = bio_add_page(bio, block_ctx->pagev[j],

fs/btrfs/compression.c

+5 −13
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include <linux/kernel.h>

#include <linux/bio.h>

#include <linux/buffer_head.h>

#include <linux/file.h>

#include <linux/fs.h>

#include <linux/pagemap.h>
@@ -14,10 +13,7 @@ 
#include <linux/init.h>

#include <linux/string.h>

#include <linux/backing-dev.h>

#include <linux/mpage.h>

#include <linux/swap.h>

#include <linux/writeback.h>

#include <linux/bit_spinlock.h>

#include <linux/slab.h>

#include <linux/sched/mm.h>

#include <linux/log2.h>
@@ -303,7 +299,6 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	struct bio *bio = NULL;

	struct compressed_bio *cb;

	unsigned long bytes_left;

	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;

	int pg_index = 0;

	struct page *page;

	u64 first_byte = disk_start;
@@ -342,9 +337,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
		page = compressed_pages[pg_index];

		page->mapping = inode->i_mapping;

		if (bio->bi_iter.bi_size)

			submit = io_tree->ops->merge_bio_hook(page, 0,

							   PAGE_SIZE,

							   bio, 0);

			submit = btrfs_merge_bio_hook(page, 0, PAGE_SIZE, bio, 0);



		page->mapping = NULL;

		if (submit || bio_add_page(bio, page, PAGE_SIZE, 0) <
@@ -613,7 +606,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	cb->len = bio->bi_iter.bi_size;



	comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);

	bio_set_op_attrs (comp_bio, REQ_OP_READ, 0);

	comp_bio->bi_opf = REQ_OP_READ;

	comp_bio->bi_private = cb;

	comp_bio->bi_end_io = end_compressed_bio_read;

	refcount_set(&cb->pending_bios, 1);
@@ -626,8 +619,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		page->index = em_start >> PAGE_SHIFT;



		if (comp_bio->bi_iter.bi_size)

			submit = tree->ops->merge_bio_hook(page, 0,

							PAGE_SIZE,

			submit = btrfs_merge_bio_hook(page, 0, PAGE_SIZE,

					comp_bio, 0);



		page->mapping = NULL;
@@ -660,7 +652,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			}



			comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);

			bio_set_op_attrs(comp_bio, REQ_OP_READ, 0);

			comp_bio->bi_opf = REQ_OP_READ;

			comp_bio->bi_private = cb;

			comp_bio->bi_end_io = end_compressed_bio_read;