]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Btrfs: remove warn_on from use_block_rsv
authorJosef Bacik <josef@redhat.com>
Tue, 26 Oct 2010 16:55:03 +0000 (12:55 -0400)
committerJosef Bacik <josef@redhat.com>
Tue, 26 Oct 2010 16:55:03 +0000 (12:55 -0400)
Because btrfs_dirty_inode does a btrfs_join_transaction, it doesn't actually
reserve space.  It does this so we can try and dirty the inode quickly without
having to deal with the ENOSPC problems.  But if it does get back ENOSPC it
handles it properly.  The problem is use_block_rsv does a WARN_ON whenever this
case happens, even tho btrfs_dirty_inode takes it into account and actually
expects to get -ENOSPC if things are particularly tight.  So instead just remove
the warning.  Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
fs/btrfs/extent-tree.c

index e2dfd4ab3b9b0f01cfb117171998b81b9a3cf18c..33785333f293f1fc7ab671f00e9ed88b1d3de038 100644 (file)
@@ -5358,11 +5358,6 @@ use_block_rsv(struct btrfs_trans_handle *trans,
        if (!ret)
                return block_rsv;
 
-       WARN_ON(1);
-       printk(KERN_INFO"block_rsv size %llu reserved %llu freed %llu %llu\n",
-               block_rsv->size, block_rsv->reserved,
-               block_rsv->freed[0], block_rsv->freed[1]);
-
        return ERR_PTR(-ENOSPC);
 }