]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Btrfs: don't check bytes_pinned to determine if we should commit the transaction
authorJosef Bacik <josef@redhat.com>
Fri, 14 Oct 2011 17:37:45 +0000 (13:37 -0400)
committerJosef Bacik <josef@redhat.com>
Wed, 19 Oct 2011 19:12:56 +0000 (15:12 -0400)
Before the only reason to commit the transaction to recover space in
reserve_metadata_bytes() was if there were enough pinned_bytes to satisfy our
reservation.  But now we have the delayed inode stuff which will hold it's
reservations until we commit the transaction.  So say we max out our reservation
by creating a bunch of files but don't have any pinned bytes we will ENOSPC out
early even though we could commit the transaction and get that space back.  So
now just unconditionally commit the transaction since currently there is no way
to know how much metadata space is being reserved by delayed inode stuff.
Thanks,

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

index fc0de6880045588338c178260123955807c36dfc..79365a40cb3a95952a968c3976996b427b203032 100644 (file)
@@ -3568,17 +3568,6 @@ again:
                goto again;
        }
 
-       /*
-        * Not enough space to be reclaimed, don't bother committing the
-        * transaction.
-        */
-       spin_lock(&space_info->lock);
-       if (space_info->bytes_pinned < orig_bytes)
-               ret = -ENOSPC;
-       spin_unlock(&space_info->lock);
-       if (ret)
-               goto out;
-
        ret = -EAGAIN;
        if (trans)
                goto out;