diff options
author | Nikolay Borisov <n.borisov.lkml@gmail.com> | 2017-01-10 13:35:33 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-02-14 09:50:51 -0500 |
commit | e5517a7bffafdeb78ebbfb4cbee1878fb88427e5 (patch) | |
tree | a1335e78183646f55861cc2021a236e552c518d6 /fs/btrfs/delayed-inode.c | |
parent | 340c6ca9fd077030f869d90549c84f37332cfd0f (diff) |
btrfs: Make btrfs_get_or_create_delayed_node take 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.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index c97517f2a48e..0e8a8a5166d3 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -106,10 +106,9 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(struct btrfs_inode *btr | |||
106 | 106 | ||
107 | /* Will return either the node or PTR_ERR(-ENOMEM) */ | 107 | /* Will return either the node or PTR_ERR(-ENOMEM) */ |
108 | static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( | 108 | static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( |
109 | struct inode *inode) | 109 | struct btrfs_inode *btrfs_inode) |
110 | { | 110 | { |
111 | struct btrfs_delayed_node *node; | 111 | struct btrfs_delayed_node *node; |
112 | struct btrfs_inode *btrfs_inode = BTRFS_I(inode); | ||
113 | struct btrfs_root *root = btrfs_inode->root; | 112 | struct btrfs_root *root = btrfs_inode->root; |
114 | u64 ino = btrfs_ino(btrfs_inode); | 113 | u64 ino = btrfs_ino(btrfs_inode); |
115 | int ret; | 114 | int ret; |
@@ -1442,7 +1441,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, | |||
1442 | struct btrfs_dir_item *dir_item; | 1441 | struct btrfs_dir_item *dir_item; |
1443 | int ret; | 1442 | int ret; |
1444 | 1443 | ||
1445 | delayed_node = btrfs_get_or_create_delayed_node(dir); | 1444 | delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(dir)); |
1446 | if (IS_ERR(delayed_node)) | 1445 | if (IS_ERR(delayed_node)) |
1447 | return PTR_ERR(delayed_node); | 1446 | return PTR_ERR(delayed_node); |
1448 | 1447 | ||
@@ -1516,7 +1515,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, | |||
1516 | struct btrfs_key item_key; | 1515 | struct btrfs_key item_key; |
1517 | int ret; | 1516 | int ret; |
1518 | 1517 | ||
1519 | node = btrfs_get_or_create_delayed_node(dir); | 1518 | node = btrfs_get_or_create_delayed_node(BTRFS_I(dir)); |
1520 | if (IS_ERR(node)) | 1519 | if (IS_ERR(node)) |
1521 | return PTR_ERR(node); | 1520 | return PTR_ERR(node); |
1522 | 1521 | ||
@@ -1830,7 +1829,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, | |||
1830 | struct btrfs_delayed_node *delayed_node; | 1829 | struct btrfs_delayed_node *delayed_node; |
1831 | int ret = 0; | 1830 | int ret = 0; |
1832 | 1831 | ||
1833 | delayed_node = btrfs_get_or_create_delayed_node(inode); | 1832 | delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(inode)); |
1834 | if (IS_ERR(delayed_node)) | 1833 | if (IS_ERR(delayed_node)) |
1835 | return PTR_ERR(delayed_node); | 1834 | return PTR_ERR(delayed_node); |
1836 | 1835 | ||
@@ -1868,7 +1867,7 @@ int btrfs_delayed_delete_inode_ref(struct inode *inode) | |||
1868 | if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) | 1867 | if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) |
1869 | return -EAGAIN; | 1868 | return -EAGAIN; |
1870 | 1869 | ||
1871 | delayed_node = btrfs_get_or_create_delayed_node(inode); | 1870 | delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(inode)); |
1872 | if (IS_ERR(delayed_node)) | 1871 | if (IS_ERR(delayed_node)) |
1873 | return PTR_ERR(delayed_node); | 1872 | return PTR_ERR(delayed_node); |
1874 | 1873 | ||