iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: switch btrfs_remove_ordered_extent to btrfs_inode

Browse Source 
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-09-18 12:15:50 +03:00 committed by David Sterba
parent 633cc816f7
commit 71fe0a55da
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/inode.c
View File

@ -2753,7 +2753,7 @@ out:
* This needs to be done to make sure anybody waiting knows we are done * This needs to be done to make sure anybody waiting knows we are done
* updating everything for this ordered extent. * updating everything for this ordered extent.
*/ */
btrfs_remove_ordered_extent(inode, ordered_extent); btrfs_remove_ordered_extent(BTRFS_I(inode), ordered_extent);
/* once for us */ /* once for us */
btrfs_put_ordered_extent(ordered_extent); btrfs_put_ordered_extent(ordered_extent);
@ -8689,7 +8689,7 @@ void btrfs_destroy_inode(struct inode *vfs_inode)
btrfs_err(root->fs_info, btrfs_err(root->fs_info,
"found ordered extent %llu %llu on inode cleanup", "found ordered extent %llu %llu on inode cleanup",
ordered->file_offset, ordered->num_bytes); ordered->file_offset, ordered->num_bytes);
btrfs_remove_ordered_extent(vfs_inode, ordered); btrfs_remove_ordered_extent(inode, ordered);
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
} }

7
fs/btrfs/ordered-data.c
View File

@ -463,13 +463,12 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
* remove an ordered extent from the tree. No references are dropped * remove an ordered extent from the tree. No references are dropped
* and waiters are woken up. * and waiters are woken up.
*/ */
void btrfs_remove_ordered_extent(struct inode *inode, void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
struct btrfs_ordered_extent *entry) struct btrfs_ordered_extent *entry)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct btrfs_ordered_inode_tree *tree; struct btrfs_ordered_inode_tree *tree;
struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
struct btrfs_root *root = btrfs_inode->root; struct btrfs_root *root = btrfs_inode->root;
struct btrfs_fs_info *fs_info = root->fs_info;
struct rb_node *node; struct rb_node *node;
bool pending; bool pending;
@ -527,7 +526,7 @@ void btrfs_remove_ordered_extent(struct inode *inode,
list_del_init(&entry->root_extent_list); list_del_init(&entry->root_extent_list);
root->nr_ordered_extents--; root->nr_ordered_extents--;
trace_btrfs_ordered_extent_remove(BTRFS_I(inode), entry); trace_btrfs_ordered_extent_remove(btrfs_inode, entry);
if (!root->nr_ordered_extents) { if (!root->nr_ordered_extents) {
spin_lock(&fs_info->ordered_root_lock); spin_lock(&fs_info->ordered_root_lock);

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

@ -151,7 +151,7 @@ btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t)
} }
void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry); void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);
void btrfs_remove_ordered_extent(struct inode *inode, void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
struct btrfs_ordered_extent *entry); struct btrfs_ordered_extent *entry);
int btrfs_dec_test_ordered_pending(struct btrfs_inode *inode, int btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,
struct btrfs_ordered_extent **cached, struct btrfs_ordered_extent **cached,