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.