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

Commit 66ba772e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs updates from David Sterba:
 "The changes range through all types: cleanups, core chagnes, sanity
  checks, fixes, other user visible changes, detailed list below:

   - deprecated: user transaction ioctl

   - mount option ssd does not change allocation alignments

   - degraded read-write mount is allowed if all the raid profile
     constraints are met, now based on more accurate check

   - defrag: do not reset compression afterwards; the NOCOMPRESS flag
     can be now overriden by defrag

   - prep work for better extent reference tracking (related to the
     qgroup slowness with balance)

   - prep work for compression heuristics

   - memory allocation reductions (may help latencies on a loaded
     system)

   - better accounting for io waiting states

   - error handling improvements (removed BUGs)

   - added more sanity checks for shared refs

   - fix readdir vs pagefault deadlock under some circumstances

   - fix for 'no-hole' mode, certain combination of compressed and
     inline extents

   - send: fix emission of invalid clone operations

   - fixup file mode if setting acls fail

   - more fixes from fuzzing

   - oher cleanups"

* 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (104 commits)
  btrfs: submit superblock io with REQ_META and REQ_PRIO
  btrfs: remove unnecessary memory barrier in btrfs_direct_IO
  btrfs: remove superfluous chunk_tree argument from btrfs_alloc_dev_extent
  btrfs: Remove chunk_objectid parameter of btrfs_alloc_dev_extent
  btrfs: pass fs_info to btrfs_del_root instead of tree_root
  Btrfs: add one more sanity check for shared ref type
  Btrfs: remove BUG_ON in __add_tree_block
  Btrfs: remove BUG() in add_data_reference
  Btrfs: remove BUG() in print_extent_item
  Btrfs: remove BUG() in btrfs_extent_inline_ref_size
  Btrfs: convert to use btrfs_get_extent_inline_ref_type
  Btrfs: add a helper to retrive extent inline ref type
  btrfs: scrub: simplify scrub worker initialization
  btrfs: scrub: clean up division in scrub_find_csum
  btrfs: scrub: clean up division in __scrub_mark_bitmap
  btrfs: scrub: use bool for flush_all_writes
  btrfs: preserve i_mode if __btrfs_set_acl() fails
  btrfs: Remove extraneous chunk_objectid variable
  btrfs: Remove chunk_objectid argument from btrfs_make_block_group
  btrfs: Remove extra parentheses from condition in copy_items()
  ...
parents 126e76ff db95c876

fs/btrfs/acl.c

+5 −1
Original line number Diff line number Diff line
@@ -114,13 +114,17 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 
int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

	int ret;

	umode_t old_mode = inode->i_mode;



	if (type == ACL_TYPE_ACCESS && acl) {

		ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);

		if (ret)

			return ret;

	}

	return __btrfs_set_acl(NULL, inode, acl, type);

	ret = __btrfs_set_acl(NULL, inode, acl, type);

	if (ret)

		inode->i_mode = old_mode;

	return ret;

}



/*

fs/btrfs/async-thread.c

+3 −3
Original line number Diff line number Diff line
@@ -75,18 +75,18 @@ void btrfs_##name(struct work_struct *arg) \ 
}



struct btrfs_fs_info *

btrfs_workqueue_owner(struct __btrfs_workqueue *wq)

btrfs_workqueue_owner(const struct __btrfs_workqueue *wq)

{

	return wq->fs_info;

}



struct btrfs_fs_info *

btrfs_work_owner(struct btrfs_work *work)

btrfs_work_owner(const struct btrfs_work *work)

{

	return work->wq->fs_info;

}



bool btrfs_workqueue_normal_congested(struct btrfs_workqueue *wq)

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq)

{

	/*

	 * We could compare wq->normal->pending with num_online_cpus()

fs/btrfs/async-thread.h

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void btrfs_queue_work(struct btrfs_workqueue *wq, 
void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);

void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max);

void btrfs_set_work_high_priority(struct btrfs_work *work);

struct btrfs_fs_info *btrfs_work_owner(struct btrfs_work *work);

struct btrfs_fs_info *btrfs_workqueue_owner(struct __btrfs_workqueue *wq);

bool btrfs_workqueue_normal_congested(struct btrfs_workqueue *wq);

struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);

struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);

#endif

fs/btrfs/backref.c

+480 −605

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/backref.h

+13 −3
Original line number Diff line number Diff line
@@ -68,10 +68,20 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
			  u64 start_off, struct btrfs_path *path,

			  struct btrfs_inode_extref **ret_extref,

			  u64 *found_off);

int btrfs_check_shared(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 root_objectid,

		       u64 inum, u64 bytenr);

int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr);



int __init btrfs_prelim_ref_init(void);

void btrfs_prelim_ref_exit(void);



struct prelim_ref {

	struct rb_node rbnode;

	u64 root_id;

	struct btrfs_key key_for_search;

	int level;

	int count;

	struct extent_inode_elem *inode_list;

	u64 parent;

	u64 wanted_disk_byte;

};



#endif