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

Commit ff13db41 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop unused parameter from lock_extent_bits 



We've always passed 0. Stack usage will slightly decrease.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e83b1d91

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, 
	}



	lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,

			 0, &cached_state);

			 &cached_state);

	if (extent_buffer_uptodate(eb) &&

	    btrfs_header_generation(eb) == parent_transid) {

		ret = 0;

fs/btrfs/extent_io.c

+6 −6
Original line number Diff line number Diff line
@@ -1328,13 +1328,13 @@ int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
 * us if waiting is desired.

 */

int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, struct extent_state **cached_state)

		     struct extent_state **cached_state)

{

	int err;

	u64 failed_start;



	while (1) {

		err = __set_extent_bit(tree, start, end, EXTENT_LOCKED | bits,

		err = __set_extent_bit(tree, start, end, EXTENT_LOCKED,

				       EXTENT_LOCKED, &failed_start,

				       cached_state, GFP_NOFS, NULL);

		if (err == -EEXIST) {
@@ -1349,7 +1349,7 @@ int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 


int lock_extent(struct extent_io_tree *tree, u64 start, u64 end)

{

	return lock_extent_bits(tree, start, end, 0, NULL);

	return lock_extent_bits(tree, start, end, NULL);

}



int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)
@@ -1717,7 +1717,7 @@ STATIC u64 find_lock_delalloc_range(struct inode *inode, 
	BUG_ON(ret); /* Only valid values are 0 and -EAGAIN */



	/* step three, lock the state bits for the whole range */

	lock_extent_bits(tree, delalloc_start, delalloc_end, 0, &cached_state);

	lock_extent_bits(tree, delalloc_start, delalloc_end, &cached_state);



	/* then test to make sure it is all still delalloc */

	ret = test_range_bit(tree, delalloc_start, delalloc_end,
@@ -4243,7 +4243,7 @@ int extent_invalidatepage(struct extent_io_tree *tree, 
	if (start > end)

		return 0;



	lock_extent_bits(tree, start, end, 0, &cached_state);

	lock_extent_bits(tree, start, end, &cached_state);

	wait_on_page_writeback(page);

	clear_extent_bit(tree, start, end,

			 EXTENT_LOCKED | EXTENT_DIRTY | EXTENT_DELALLOC |
@@ -4453,7 +4453,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
		last_for_get_extent = isize;

	}



	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len - 1, 0,

	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len - 1,

			 &cached_state);



	em = get_extent_skip_holes(inode, start, last_for_get_extent,

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int try_release_extent_mapping(struct extent_map_tree *map, 
int try_release_extent_buffer(struct page *page);

int lock_extent(struct extent_io_tree *tree, u64 start, u64 end);

int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, struct extent_state **cached);

		     struct extent_state **cached);

int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end);

int extent_read_full_page(struct extent_io_tree *tree, struct page *page,

			  get_extent_t *get_extent, int mirror_num);

fs/btrfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages, 
	if (start_pos < inode->i_size) {

		struct btrfs_ordered_extent *ordered;

		lock_extent_bits(&BTRFS_I(inode)->io_tree,

				 start_pos, last_pos, 0, cached_state);

				 start_pos, last_pos, cached_state);

		ordered = btrfs_lookup_ordered_range(inode, start_pos,

						     last_pos - start_pos + 1);

		if (ordered &&
@@ -2384,7 +2384,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
		truncate_pagecache_range(inode, lockstart, lockend);



		lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend,

				 0, &cached_state);

				 &cached_state);

		ordered = btrfs_lookup_first_ordered_extent(inode, lockend);



		/*
@@ -2691,7 +2691,7 @@ static long btrfs_fallocate(struct file *file, int mode, 
		 * transaction

		 */

		lock_extent_bits(&BTRFS_I(inode)->io_tree, alloc_start,

				 locked_end, 0, &cached_state);

				 locked_end, &cached_state);

		ordered = btrfs_lookup_first_ordered_extent(inode,

							    alloc_end - 1);

		if (ordered &&
@@ -2838,7 +2838,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) 
	lockend--;

	len = lockend - lockstart + 1;



	lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend, 0,

	lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend,

			 &cached_state);



	while (start < inode->i_size) {

fs/btrfs/free-space-cache.c

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode, 
		goto out;



	lock_extent_bits(&BTRFS_I(inode)->io_tree, 0, i_size_read(inode) - 1,

			 0, &cached_state);

			 &cached_state);



	io_ctl_set_generation(io_ctl, trans->transid);