diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-30 00:53:03 +0300 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /fs/btrfs/delayed-inode.c | |
| parent | b15d53d009558d14c4f394a6d1fa2039c7f45c43 (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index b57daa895cea..6cef0062f929 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -43,8 +43,7 @@ int __init btrfs_delayed_inode_init(void) void btrfs_delayed_inode_exit(void) { - if (delayed_node_cache) - kmem_cache_destroy(delayed_node_cache); + kmem_cache_destroy(delayed_node_cache); } static inline void btrfs_init_delayed_node( @@ -651,9 +650,14 @@ static int btrfs_delayed_inode_reserve_metadata( goto out; ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes); - if (!WARN_ON(ret)) + if (!ret) goto out; + if (btrfs_test_opt(root, ENOSPC_DEBUG)) { + btrfs_debug(root->fs_info, + "block rsv migrate returned %d", ret); + WARN_ON(1); + } /* * Ok this is a problem, let's just steal from the global rsv * since this really shouldn't happen that often. |