Commit 36d45567 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: remove the wait argument to btrfs_start_ordered_extent 



Given that wait is always set to 1, so remove the argument.
Last use of wait with 0 was in 0c304304 ("Btrfs: remove
csum_bytes_left").

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 235e1c7b

fs/btrfs/defrag.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static struct page *defrag_prepare_one_page(struct btrfs_inode *inode, pgoff_t i 
			break;



		unlock_page(page);

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		btrfs_put_ordered_extent(ordered);

		lock_page(page);

		/*

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages, 
				unlock_page(pages[i]);

				put_page(pages[i]);

			}

			btrfs_start_ordered_extent(ordered, 1);

			btrfs_start_ordered_extent(ordered);

			btrfs_put_ordered_extent(ordered);

			return -EAGAIN;

		}

fs/btrfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -2969,7 +2969,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) 
		unlock_extent(&inode->io_tree, page_start, page_end,

			      &cached_state);

		unlock_page(page);

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		btrfs_put_ordered_extent(ordered);

		goto again;

	}
@@ -4987,7 +4987,7 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len, 
		unlock_extent(io_tree, block_start, block_end, &cached_state);

		unlock_page(page);

		put_page(page);

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		btrfs_put_ordered_extent(ordered);

		goto again;

	}
@@ -7392,7 +7392,7 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend, 
			 */

			if (writing ||

			    test_bit(BTRFS_ORDERED_DIRECT, &ordered->flags))

				btrfs_start_ordered_extent(ordered, 1);

				btrfs_start_ordered_extent(ordered);

			else

				ret = nowait ? -EAGAIN : -ENOTBLK;

			btrfs_put_ordered_extent(ordered);
@@ -8552,7 +8552,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
		unlock_extent(io_tree, page_start, page_end, &cached_state);

		unlock_page(page);

		up_read(&BTRFS_I(inode)->i_mmap_lock);

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		btrfs_put_ordered_extent(ordered);

		goto again;

	}

fs/btrfs/ordered-data.c

+11 −14
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work) 
	struct btrfs_ordered_extent *ordered;



	ordered = container_of(work, struct btrfs_ordered_extent, flush_work);

	btrfs_start_ordered_extent(ordered, 1);

	btrfs_start_ordered_extent(ordered);

	complete(&ordered->completion);

}
@@ -716,13 +716,12 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr, 
}



/*

 * Used to start IO or wait for a given ordered extent to finish.

 * Start IO and wait for a given ordered extent to finish.

 *

 * If wait is one, this effectively waits on page writeback for all the pages

 * in the extent, and it waits on the io completion code to insert

 * metadata into the btree corresponding to the extent

 * Wait on page writeback for all the pages in the extent and the IO completion

 * code to insert metadata into the btree corresponding to the extent.

 */

void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait)

void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)

{

	u64 start = entry->file_offset;

	u64 end = start + entry->num_bytes - 1;
@@ -744,12 +743,10 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait) 
	 */

	if (!test_bit(BTRFS_ORDERED_DIRECT, &entry->flags))

		filemap_fdatawrite_range(inode->vfs_inode.i_mapping, start, end);

	if (wait) {



	if (!freespace_inode)

		btrfs_might_wait_for_event(inode->root->fs_info, btrfs_ordered_extent);

		wait_event(entry->wait, test_bit(BTRFS_ORDERED_COMPLETE,

						 &entry->flags));

	}

	wait_event(entry->wait, test_bit(BTRFS_ORDERED_COMPLETE, &entry->flags));

}



/*
@@ -800,7 +797,7 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len) 
			btrfs_put_ordered_extent(ordered);

			break;

		}

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		end = ordered->file_offset;

		/*

		 * If the ordered extent had an error save the error but don't
@@ -1061,7 +1058,7 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start, 
			break;

		}

		unlock_extent(&inode->io_tree, start, end, cachedp);

		btrfs_start_ordered_extent(ordered, 1);

		btrfs_start_ordered_extent(ordered);

		btrfs_put_ordered_extent(ordered);

	}

}

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, 
			   struct btrfs_ordered_sum *sum);

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,

							 u64 file_offset);

void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry, int wait);

void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry);

int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);

struct btrfs_ordered_extent *

btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset);