diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2019-05-07 10:19:23 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-07-01 14:34:59 +0300 |
| commit | 23d31bd476d1d096d0f073483547872ec155ab34 (patch) | |
| tree | 8b87d3dc9118dce18703a7594775023f54383f6f /fs/btrfs/file.c | |
| parent | ffa87214c1100c7ea38e85a3cf981d0d47b1c744 (diff) | |
| download | linux-23d31bd476d1d096d0f073483547872ec155ab34.tar.xz | |
btrfs: Use newly introduced btrfs_lock_and_flush_ordered_range
There several functions which open code
btrfs_lock_and_flush_ordered_range, just replace them with a call to the
function. No functional changes.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 89f5be2bfb43..007652ff5cb6 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1550,7 +1550,6 @@ static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, { struct btrfs_fs_info *fs_info = inode->root->fs_info; struct btrfs_root *root = inode->root; - struct btrfs_ordered_extent *ordered; u64 lockstart, lockend; u64 num_bytes; int ret; @@ -1563,17 +1562,8 @@ static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, lockend = round_up(pos + *write_bytes, fs_info->sectorsize) - 1; - while (1) { - lock_extent(&inode->io_tree, lockstart, lockend); - ordered = btrfs_lookup_ordered_range(inode, lockstart, - lockend - lockstart + 1); - if (!ordered) { - break; - } - unlock_extent(&inode->io_tree, lockstart, lockend); - btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1); - btrfs_put_ordered_extent(ordered); - } + btrfs_lock_and_flush_ordered_range(&inode->io_tree, inode, lockstart, + lockend, NULL); num_bytes = lockend - lockstart + 1; ret = can_nocow_extent(&inode->vfs_inode, lockstart, &num_bytes, |