aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/delayed-inode.c
diff options
context:
space:
mode:
authorNikolay Borisov <n.borisov.lkml@gmail.com>2017-01-10 13:35:34 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:52 -0500
commitfcabdd1ca51f9fd6ced977b2279da19d123b7512 (patch)
tree4ef4ec9331b2a408e674b4712c35c393c04b304d /fs/btrfs/delayed-inode.c
parente5517a7bffafdeb78ebbfb4cbee1878fb88427e5 (diff)
btrfs: Make btrfs_delayed_inode_reserve_metadata 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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 0e8a8a5166d3..aa7032d1c5ae 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -572,7 +572,7 @@ static void btrfs_delayed_item_release_metadata(struct btrfs_fs_info *fs_info,
572static int btrfs_delayed_inode_reserve_metadata( 572static int btrfs_delayed_inode_reserve_metadata(
573 struct btrfs_trans_handle *trans, 573 struct btrfs_trans_handle *trans,
574 struct btrfs_root *root, 574 struct btrfs_root *root,
575 struct inode *inode, 575 struct btrfs_inode *inode,
576 struct btrfs_delayed_node *node) 576 struct btrfs_delayed_node *node)
577{ 577{
578 struct btrfs_fs_info *fs_info = root->fs_info; 578 struct btrfs_fs_info *fs_info = root->fs_info;
@@ -601,13 +601,13 @@ static int btrfs_delayed_inode_reserve_metadata(
601 * worth which is less likely to hurt us. 601 * worth which is less likely to hurt us.
602 */ 602 */
603 if (src_rsv && src_rsv->type == BTRFS_BLOCK_RSV_DELALLOC) { 603 if (src_rsv && src_rsv->type == BTRFS_BLOCK_RSV_DELALLOC) {
604 spin_lock(&BTRFS_I(inode)->lock); 604 spin_lock(&inode->lock);
605 if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED, 605 if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
606 &BTRFS_I(inode)->runtime_flags)) 606 &inode->runtime_flags))
607 release = true; 607 release = true;
608 else 608 else
609 src_rsv = NULL; 609 src_rsv = NULL;
610 spin_unlock(&BTRFS_I(inode)->lock); 610 spin_unlock(&inode->lock);
611 } 611 }
612 612
613 /* 613 /*
@@ -635,7 +635,7 @@ static int btrfs_delayed_inode_reserve_metadata(
635 node->bytes_reserved = num_bytes; 635 node->bytes_reserved = num_bytes;
636 trace_btrfs_space_reservation(fs_info, 636 trace_btrfs_space_reservation(fs_info,
637 "delayed_inode", 637 "delayed_inode",
638 btrfs_ino(BTRFS_I(inode)), 638 btrfs_ino(inode),
639 num_bytes, 1); 639 num_bytes, 1);
640 } 640 }
641 return ret; 641 return ret;
@@ -658,13 +658,13 @@ static int btrfs_delayed_inode_reserve_metadata(
658 */ 658 */
659 if (!ret) { 659 if (!ret) {
660 trace_btrfs_space_reservation(fs_info, "delayed_inode", 660 trace_btrfs_space_reservation(fs_info, "delayed_inode",
661 btrfs_ino(BTRFS_I(inode)), num_bytes, 1); 661 btrfs_ino(inode), num_bytes, 1);
662 node->bytes_reserved = num_bytes; 662 node->bytes_reserved = num_bytes;
663 } 663 }
664 664
665 if (release) { 665 if (release) {
666 trace_btrfs_space_reservation(fs_info, "delalloc", 666 trace_btrfs_space_reservation(fs_info, "delalloc",
667 btrfs_ino(BTRFS_I(inode)), num_bytes, 0); 667 btrfs_ino(inode), num_bytes, 0);
668 btrfs_block_rsv_release(fs_info, src_rsv, num_bytes); 668 btrfs_block_rsv_release(fs_info, src_rsv, num_bytes);
669 } 669 }
670 670
@@ -1839,7 +1839,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
1839 goto release_node; 1839 goto release_node;
1840 } 1840 }
1841 1841
1842 ret = btrfs_delayed_inode_reserve_metadata(trans, root, inode, 1842 ret = btrfs_delayed_inode_reserve_metadata(trans, root, BTRFS_I(inode),
1843 delayed_node); 1843 delayed_node);
1844 if (ret) 1844 if (ret)
1845 goto release_node; 1845 goto release_node;