Merge branch 'cleanup/misc-simplify' of... (afa427cf) · Commits · e / devices / android_kernel_fairphone_FP4

fs/btrfs/ctree.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3906,7 +3906,6 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
	/* inode.c */		/* inode.c */
	struct btrfs_delalloc_work {		struct btrfs_delalloc_work {
	struct inode *inode;		struct inode *inode;
	int wait;
	int delay_iput;		int delay_iput;
	struct completion completion;		struct completion completion;
	struct list_head list;		struct list_head list;
	@@ -3914,7 +3913,7 @@ struct btrfs_delalloc_work {
	};		};

	struct btrfs_delalloc_work btrfs_alloc_delalloc_work(struct inode inode,		struct btrfs_delalloc_work btrfs_alloc_delalloc_work(struct inode inode,
	int wait, int delay_iput);		int delay_iput);
	void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work);		void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work);

	struct extent_map btrfs_get_extent_fiemap(struct inode inode, struct page *page,		struct extent_map btrfs_get_extent_fiemap(struct inode inode, struct page *page,

fs/btrfs/disk-io.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3902,11 +3902,6 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
	return !ret;		return !ret;
	}		}

	int btrfs_set_buffer_uptodate(struct extent_buffer *buf)
	{
	return set_extent_buffer_uptodate(buf);
	}

	void btrfs_mark_buffer_dirty(struct extent_buffer *buf)		void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
	{		{
	struct btrfs_root *root;		struct btrfs_root *root;

fs/btrfs/disk-io.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,7 +116,6 @@ static inline void btrfs_put_fs_root(struct btrfs_root *root)
	void btrfs_mark_buffer_dirty(struct extent_buffer *buf);		void btrfs_mark_buffer_dirty(struct extent_buffer *buf);
	int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,		int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
	int atomic);		int atomic);
	int btrfs_set_buffer_uptodate(struct extent_buffer *buf);
	int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);		int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);
	u32 btrfs_csum_data(char *data, u32 seed, size_t len);		u32 btrfs_csum_data(char *data, u32 seed, size_t len);
	void btrfs_csum_final(u32 crc, char *result);		void btrfs_csum_final(u32 crc, char *result);

fs/btrfs/extent-tree.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7834,7 +7834,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle trans, struct btrfs_root root,
	clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);		clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);

	btrfs_set_lock_blocking(buf);		btrfs_set_lock_blocking(buf);
	btrfs_set_buffer_uptodate(buf);		set_extent_buffer_uptodate(buf);

	if (root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {		if (root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {
	buf->log_index = root->log_transid % 2;		buf->log_index = root->log_transid % 2;

fs/btrfs/extent_io.c

+9 −18

Original line number	Original line	Diff line number	Diff line
	@@ -1451,7 +1451,7 @@ int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)
	GFP_NOFS);		GFP_NOFS);
	}		}

	int extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)		void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)
	{		{
	unsigned long index = start >> PAGE_CACHE_SHIFT;		unsigned long index = start >> PAGE_CACHE_SHIFT;
	unsigned long end_index = end >> PAGE_CACHE_SHIFT;		unsigned long end_index = end >> PAGE_CACHE_SHIFT;
	@@ -1464,10 +1464,9 @@ int extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)
	page_cache_release(page);		page_cache_release(page);
	index++;		index++;
	}		}
	return 0;
	}		}

	int extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)		void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)
	{		{
	unsigned long index = start >> PAGE_CACHE_SHIFT;		unsigned long index = start >> PAGE_CACHE_SHIFT;
	unsigned long end_index = end >> PAGE_CACHE_SHIFT;		unsigned long end_index = end >> PAGE_CACHE_SHIFT;
	@@ -1481,13 +1480,12 @@ int extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)
	page_cache_release(page);		page_cache_release(page);
	index++;		index++;
	}		}
	return 0;
	}		}

	/*		/*
	* helper function to set both pages and extents in the tree writeback		* helper function to set both pages and extents in the tree writeback
	*/		*/
	static int set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end)		static void set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end)
	{		{
	unsigned long index = start >> PAGE_CACHE_SHIFT;		unsigned long index = start >> PAGE_CACHE_SHIFT;
	unsigned long end_index = end >> PAGE_CACHE_SHIFT;		unsigned long end_index = end >> PAGE_CACHE_SHIFT;
	@@ -1500,7 +1498,6 @@ static int set_range_writeback(struct extent_io_tree *tree, u64 start, u64 end)
	page_cache_release(page);		page_cache_release(page);
	index++;		index++;
	}		}
	return 0;
	}		}

	/* find the first state struct with 'bits' set after 'start', and		/* find the first state struct with 'bits' set after 'start', and
	@@ -1820,7 +1817,7 @@ STATIC u64 find_lock_delalloc_range(struct inode *inode,
	return found;		return found;
	}		}

	int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,		void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
	struct page *locked_page,		struct page *locked_page,
	unsigned clear_bits,		unsigned clear_bits,
	unsigned long page_ops)		unsigned long page_ops)
	@@ -1835,7 +1832,7 @@ int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,

	clear_extent_bit(tree, start, end, clear_bits, 1, 0, NULL, GFP_NOFS);		clear_extent_bit(tree, start, end, clear_bits, 1, 0, NULL, GFP_NOFS);
	if (page_ops == 0)		if (page_ops == 0)
	return 0;		return;

	if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0)		if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0)
	mapping_set_error(inode->i_mapping, -EIO);		mapping_set_error(inode->i_mapping, -EIO);
	@@ -1869,7 +1866,6 @@ int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
	index += ret;		index += ret;
	cond_resched();		cond_resched();
	}		}
	return 0;
	}		}

	/*		/*
	@@ -2516,7 +2512,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,

	/* lots and lots of room for performance fixes in the end_bio funcs */		/* lots and lots of room for performance fixes in the end_bio funcs */

	int end_extent_writepage(struct page *page, int err, u64 start, u64 end)		void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
	{		{
	int uptodate = (err == 0);		int uptodate = (err == 0);
	struct extent_io_tree *tree;		struct extent_io_tree *tree;
	@@ -2537,7 +2533,6 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end)
	ret = ret < 0 ? ret : -EIO;		ret = ret < 0 ? ret : -EIO;
	mapping_set_error(page->mapping, ret);		mapping_set_error(page->mapping, ret);
	}		}
	return 0;
	}		}

	/*		/*
	@@ -2579,9 +2574,7 @@ static void end_bio_extent_writepage(struct bio *bio)
	start = page_offset(page);		start = page_offset(page);
	end = start + bvec->bv_offset + bvec->bv_len - 1;		end = start + bvec->bv_offset + bvec->bv_len - 1;

	if (end_extent_writepage(page, bio->bi_error, start, end))		end_extent_writepage(page, bio->bi_error, start, end);
	continue;

	end_page_writeback(page);		end_page_writeback(page);
	}		}

	@@ -5227,7 +5220,7 @@ int set_extent_buffer_dirty(struct extent_buffer *eb)
	return was_dirty;		return was_dirty;
	}		}

	int clear_extent_buffer_uptodate(struct extent_buffer *eb)		void clear_extent_buffer_uptodate(struct extent_buffer *eb)
	{		{
	unsigned long i;		unsigned long i;
	struct page *page;		struct page *page;
	@@ -5240,10 +5233,9 @@ int clear_extent_buffer_uptodate(struct extent_buffer *eb)
	if (page)		if (page)
	ClearPageUptodate(page);		ClearPageUptodate(page);
	}		}
	return 0;
	}		}

	int set_extent_buffer_uptodate(struct extent_buffer *eb)		void set_extent_buffer_uptodate(struct extent_buffer *eb)
	{		{
	unsigned long i;		unsigned long i;
	struct page *page;		struct page *page;
	@@ -5255,7 +5247,6 @@ int set_extent_buffer_uptodate(struct extent_buffer *eb)
	page = eb->pages[i];		page = eb->pages[i];
	SetPageUptodate(page);		SetPageUptodate(page);
	}		}
	return 0;
	}		}

	int extent_buffer_uptodate(struct extent_buffer *eb)		int extent_buffer_uptodate(struct extent_buffer *eb)