summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/delayed-inode.c
diff options
context:
space:
mode:
authorNikolay Borisov <n.borisov.lkml@gmail.com>2017-01-10 13:35:32 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:51 -0500
commit340c6ca9fd077030f869d90549c84f37332cfd0f (patch)
tree3253ada0fc0f541774ff2dcc7074782fd3f6e0c5 /fs/btrfs/delayed-inode.c
parent4a0cc7ca6c40b607b8aaa0bf6e97ffd74d64c2d8 (diff)
btrfs: Make btrfs_get_delayed_node take btrfs_inode
This function is internal to btrfs and doesn't really deal with any VFS members, as such it needn't take a struct inode refrence but btrfs_inode. Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
-rw-r--r--fs/btrfs/delayed-inode.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 40be12891344..c97517f2a48e 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -72,9 +72,8 @@ static inline int btrfs_is_continuous_delayed_item(
72 return 0; 72 return 0;
73} 73}
74 74
75static struct btrfs_delayed_node *btrfs_get_delayed_node(struct inode *inode) 75static struct btrfs_delayed_node *btrfs_get_delayed_node(struct btrfs_inode *btrfs_inode)
76{ 76{
77 struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
78 struct btrfs_root *root = btrfs_inode->root; 77 struct btrfs_root *root = btrfs_inode->root;
79 u64 ino = btrfs_ino(btrfs_inode); 78 u64 ino = btrfs_ino(btrfs_inode);
80 struct btrfs_delayed_node *node; 79 struct btrfs_delayed_node *node;
@@ -116,7 +115,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
116 int ret; 115 int ret;
117 116
118again: 117again:
119 node = btrfs_get_delayed_node(inode); 118 node = btrfs_get_delayed_node(btrfs_inode);
120 if (node) 119 if (node)
121 return node; 120 return node;
122 121
@@ -1198,7 +1197,7 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans,
1198int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 1197int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
1199 struct inode *inode) 1198 struct inode *inode)
1200{ 1199{
1201 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode); 1200 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1202 struct btrfs_path *path; 1201 struct btrfs_path *path;
1203 struct btrfs_block_rsv *block_rsv; 1202 struct btrfs_block_rsv *block_rsv;
1204 int ret; 1203 int ret;
@@ -1237,7 +1236,7 @@ int btrfs_commit_inode_delayed_inode(struct inode *inode)
1237{ 1236{
1238 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); 1237 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
1239 struct btrfs_trans_handle *trans; 1238 struct btrfs_trans_handle *trans;
1240 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode); 1239 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1241 struct btrfs_path *path; 1240 struct btrfs_path *path;
1242 struct btrfs_block_rsv *block_rsv; 1241 struct btrfs_block_rsv *block_rsv;
1243 int ret; 1242 int ret;
@@ -1560,7 +1559,7 @@ end:
1560 1559
1561int btrfs_inode_delayed_dir_index_count(struct inode *inode) 1560int btrfs_inode_delayed_dir_index_count(struct inode *inode)
1562{ 1561{
1563 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode); 1562 struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1564 1563
1565 if (!delayed_node) 1564 if (!delayed_node)
1566 return -ENOENT; 1565 return -ENOENT;
@@ -1587,7 +1586,7 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,
1587 struct btrfs_delayed_node *delayed_node; 1586 struct btrfs_delayed_node *delayed_node;
1588 struct btrfs_delayed_item *item; 1587 struct btrfs_delayed_item *item;
1589 1588
1590 delayed_node = btrfs_get_delayed_node(inode); 1589 delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1591 if (!delayed_node) 1590 if (!delayed_node)
1592 return false; 1591 return false;
1593 1592
@@ -1776,7 +1775,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
1776 struct btrfs_delayed_node *delayed_node; 1775 struct btrfs_delayed_node *delayed_node;
1777 struct btrfs_inode_item *inode_item; 1776 struct btrfs_inode_item *inode_item;
1778 1777
1779 delayed_node = btrfs_get_delayed_node(inode); 1778 delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1780 if (!delayed_node) 1779 if (!delayed_node)
1781 return -ENOENT; 1780 return -ENOENT;
1782 1781
@@ -1937,7 +1936,7 @@ void btrfs_kill_delayed_inode_items(struct inode *inode)
1937{ 1936{
1938 struct btrfs_delayed_node *delayed_node; 1937 struct btrfs_delayed_node *delayed_node;
1939 1938
1940 delayed_node = btrfs_get_delayed_node(inode); 1939 delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));
1941 if (!delayed_node) 1940 if (!delayed_node)
1942 return; 1941 return;
1943 1942