diff options
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
-rw-r--r-- | fs/btrfs/delayed-inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 52c85e2b95d0..478f66bdc57b 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -29,7 +29,7 @@ static struct kmem_cache *delayed_node_cache; | |||
29 | 29 | ||
30 | int __init btrfs_delayed_inode_init(void) | 30 | int __init btrfs_delayed_inode_init(void) |
31 | { | 31 | { |
32 | delayed_node_cache = kmem_cache_create("delayed_node", | 32 | delayed_node_cache = kmem_cache_create("btrfs_delayed_node", |
33 | sizeof(struct btrfs_delayed_node), | 33 | sizeof(struct btrfs_delayed_node), |
34 | 0, | 34 | 0, |
35 | SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, | 35 | SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, |
@@ -650,7 +650,7 @@ static int btrfs_delayed_inode_reserve_metadata( | |||
650 | * we're accounted for. | 650 | * we're accounted for. |
651 | */ | 651 | */ |
652 | if (!src_rsv || (!trans->bytes_reserved && | 652 | if (!src_rsv || (!trans->bytes_reserved && |
653 | src_rsv != &root->fs_info->delalloc_block_rsv)) { | 653 | src_rsv->type != BTRFS_BLOCK_RSV_DELALLOC)) { |
654 | ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes); | 654 | ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes); |
655 | /* | 655 | /* |
656 | * Since we're under a transaction reserve_metadata_bytes could | 656 | * Since we're under a transaction reserve_metadata_bytes could |
@@ -668,7 +668,7 @@ static int btrfs_delayed_inode_reserve_metadata( | |||
668 | num_bytes, 1); | 668 | num_bytes, 1); |
669 | } | 669 | } |
670 | return ret; | 670 | return ret; |
671 | } else if (src_rsv == &root->fs_info->delalloc_block_rsv) { | 671 | } else if (src_rsv->type == BTRFS_BLOCK_RSV_DELALLOC) { |
672 | spin_lock(&BTRFS_I(inode)->lock); | 672 | spin_lock(&BTRFS_I(inode)->lock); |
673 | if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED, | 673 | if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED, |
674 | &BTRFS_I(inode)->runtime_flags)) { | 674 | &BTRFS_I(inode)->runtime_flags)) { |