GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-21 06:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: make btrfs_add_ordered_extent take btrfs_inode

Browse source 
Preparation to converting its callers to taking btrfs_inode.

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 2020-06-03 08:55:13 +03:00 • committed by David Sterba
parent a0349401c1
commit e7fbf60453
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/btrfs/inode.c
View file

@ -1081,8 +1081,9 @@ static noinline int cow_file_range(struct inode *inode,
} }
free_extent_map(em); free_extent_map(em);
ret = btrfs_add_ordered_extent(inode, start, ins.objectid, ret = btrfs_add_ordered_extent(BTRFS_I(inode), start,
ram_size, cur_alloc_size, 0); ins.objectid, ram_size,
cur_alloc_size, 0);
if (ret) if (ret)
goto out_drop_extent_cache; goto out_drop_extent_cache;
@ -1716,7 +1717,7 @@ out_check:
goto error; goto error;
} }
free_extent_map(em); free_extent_map(em);
ret = btrfs_add_ordered_extent(inode, cur_offset, ret = btrfs_add_ordered_extent(BTRFS_I(inode), cur_offset,
disk_bytenr, num_bytes, disk_bytenr, num_bytes,
num_bytes, num_bytes,
BTRFS_ORDERED_PREALLOC); BTRFS_ORDERED_PREALLOC);
@ -1728,7 +1729,7 @@ out_check:
goto error; goto error;
} }
} else { } else {
ret = btrfs_add_ordered_extent(inode, cur_offset, ret = btrfs_add_ordered_extent(BTRFS_I(inode), cur_offset,
disk_bytenr, num_bytes, disk_bytenr, num_bytes,
num_bytes, num_bytes,
BTRFS_ORDERED_NOCOW); BTRFS_ORDERED_NOCOW);

4
fs/btrfs/ordered-data.c
View file

@ -252,11 +252,11 @@ static int __btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset
return 0; return 0;
} }
int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset, int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,
u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes, u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,
int type) int type)
{ {
return __btrfs_add_ordered_extent(BTRFS_I(inode), file_offset, disk_bytenr, return __btrfs_add_ordered_extent(inode, file_offset, disk_bytenr,
num_bytes, disk_num_bytes, type, 0, num_bytes, disk_num_bytes, type, 0,
BTRFS_COMPRESS_NONE); BTRFS_COMPRESS_NONE);
} }

2
fs/btrfs/ordered-data.h
View file

@ -151,7 +151,7 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
struct btrfs_ordered_extent **cached, struct btrfs_ordered_extent **cached,
u64 *file_offset, u64 io_size, u64 *file_offset, u64 io_size,
int uptodate); int uptodate);
int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset, int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,
u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes, u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,
int type); int type);
int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset, int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,