public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: Use while loop instead of labels in __endio_write_update_ordered

Browse source 
Currently __endio_write_update_ordered uses labels to implement
what is essentially a simple while loop. This makes the code more
cumbersome to follow than it actually has to be. No functional
changes. No xfstest regressions were found during testing.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-04-11 11:21:17 +03:00 • committed by David Sterba
parent 89595e80de
commit b25f0d0012
1 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
fs/btrfs/inode.c
View file

@ -8131,7 +8131,6 @@ static void __endio_write_update_ordered(struct inode *inode,
u64 ordered_offset = offset; u64 ordered_offset = offset;
u64 ordered_bytes = bytes; u64 ordered_bytes = bytes;
u64 last_offset; u64 last_offset;
int ret;
if (btrfs_is_free_space_inode(BTRFS_I(inode))) { if (btrfs_is_free_space_inode(BTRFS_I(inode))) {
wq = fs_info->endio_freespace_worker; wq = fs_info->endio_freespace_worker;
@ -8141,32 +8140,31 @@ static void __endio_write_update_ordered(struct inode *inode,
func = btrfs_endio_write_helper; func = btrfs_endio_write_helper;
} }
again: while (ordered_offset < offset + bytes) {
last_offset = ordered_offset; last_offset = ordered_offset;
ret = btrfs_dec_test_first_ordered_pending(inode, &ordered, if (btrfs_dec_test_first_ordered_pending(inode, &ordered,
&ordered_offset, &ordered_offset,
ordered_bytes, ordered_bytes,
uptodate); uptodate)) {
if (!ret) btrfs_init_work(&ordered->work, func,
goto out_test; finish_ordered_fn,
NULL, NULL);
btrfs_init_work(&ordered->work, func, finish_ordered_fn, NULL, NULL); btrfs_queue_work(wq, &ordered->work);
btrfs_queue_work(wq, &ordered->work); }
out_test: /*
/* * If btrfs_dec_test_ordered_pending does not find any ordered
* If btrfs_dec_test_ordered_pending does not find any ordered extent * extent in the range, we can exit.
* in the range, we can exit. */
*/ if (ordered_offset == last_offset)
if (ordered_offset == last_offset) return;
return; /*
/* * Our bio might span multiple ordered extents. In this case
* our bio might span multiple ordered extents. If we haven't * we keep goin until we have accounted the whole dio.
* completed the accounting for the whole dio, go back and try again */
*/ if (ordered_offset < offset + bytes) {
if (ordered_offset < offset + bytes) { ordered_bytes = offset + bytes - ordered_offset;
ordered_bytes = offset + bytes - ordered_offset; ordered = NULL;
ordered = NULL; }
goto again;
} }
} }