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

Commit ff95acb6 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'integration' into for-linus

parents 02f8c6ae 75c195a2

fs/btrfs/btrfs_inode.h

+14 −2
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ struct btrfs_inode { 
	 */

	struct btrfs_key location;



	/* Lock for counters */

	spinlock_t lock;



	/* the extent_tree has caches of all the extent mappings to disk */

	struct extent_map_tree extent_tree;
@@ -134,8 +137,8 @@ struct btrfs_inode { 
	 * items we think we'll end up using, and reserved_extents is the number

	 * of extent items we've reserved metadata for.

	 */

	atomic_t outstanding_extents;

	atomic_t reserved_extents;

	unsigned outstanding_extents;

	unsigned reserved_extents;



	/*

	 * ordered_data_close is set by truncate when a file that used
@@ -184,4 +187,13 @@ static inline void btrfs_i_size_write(struct inode *inode, u64 size) 
	BTRFS_I(inode)->disk_i_size = size;

}



static inline bool btrfs_is_free_space_inode(struct btrfs_root *root,

				       struct inode *inode)

{

	if (root == root->fs_info->tree_root ||

	    BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID)

		return true;

	return false;

}



#endif

fs/btrfs/ctree.c

+198 −259

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/ctree.h

+8 −6
Original line number Diff line number Diff line
@@ -755,6 +755,8 @@ struct btrfs_space_info { 
				   chunks for this space */

	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */



	unsigned int flush:1;		/* set if we are trying to make space */



	unsigned int force_alloc;	/* set if we need to force a chunk

					   alloc for this space */
@@ -764,7 +766,7 @@ struct btrfs_space_info { 
	struct list_head block_groups[BTRFS_NR_RAID_TYPES];

	spinlock_t lock;

	struct rw_semaphore groups_sem;

	atomic_t caching_threads;

	wait_queue_head_t wait;

};



struct btrfs_block_rsv {
@@ -824,6 +826,7 @@ struct btrfs_caching_control { 
	struct list_head list;

	struct mutex mutex;

	wait_queue_head_t wait;

	struct btrfs_work work;

	struct btrfs_block_group_cache *block_group;

	u64 progress;

	atomic_t count;
@@ -1032,6 +1035,8 @@ struct btrfs_fs_info { 
	struct btrfs_workers endio_write_workers;

	struct btrfs_workers endio_freespace_worker;

	struct btrfs_workers submit_workers;

	struct btrfs_workers caching_workers;



	/*

	 * fixup workers take dirty pages that didn't properly go through

	 * the cow mechanism and make them safe to write.  It happens
@@ -2128,7 +2133,7 @@ static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info) 


/* extent-tree.c */

static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_root *root,

						 int num_items)

						 unsigned num_items)

{

	return (root->leafsize + root->nodesize * (BTRFS_MAX_LEVEL - 1)) *

		3 * num_items;
@@ -2222,9 +2227,6 @@ void btrfs_set_inode_space_info(struct btrfs_root *root, struct inode *ionde); 
void btrfs_clear_space_info_full(struct btrfs_fs_info *info);

int btrfs_check_data_free_space(struct inode *inode, u64 bytes);

void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes);

int btrfs_trans_reserve_metadata(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

				int num_items);

void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,

				struct btrfs_root *root);

int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
@@ -2330,7 +2332,7 @@ struct btrfs_path *btrfs_alloc_path(void); 
void btrfs_free_path(struct btrfs_path *p);

void btrfs_set_path_blocking(struct btrfs_path *p);

void btrfs_clear_path_blocking(struct btrfs_path *p,

			       struct extent_buffer *held);

			       struct extent_buffer *held, int held_rw);

void btrfs_unlock_up_safe(struct btrfs_path *p, int level);



int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,

fs/btrfs/delayed-inode.c

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/dir-item.c

+2 −7

File changed.

Preview size limit exceeded, changes collapsed.