From: Josef Bacik <josef@redhat.com>
Date: Fri, 13 Jan 2012 00:10:12 +0000 (-0500)
Subject: Btrfs: release space on error in page_mkwrite
X-Git-Tag: v2.6.39-400.9.0~639
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25a65a877cc4902dfe7fd39599f96f898bbb5b1f;p=users%2Fjedix%2Flinux-maple.git

Btrfs: release space on error in page_mkwrite

If updating the inode gave us an ENOSPC we were just returning in page_mkwrite,
which is a problem since we make our reservation right before trying to update
the inode, so fix the out label so that we actually free our reservation.
Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
(cherry picked from commit ec39e180fd3188c983c94603634bfcd019f42ae7)
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0ead6ddfc0e7..e9e3f375b683 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6444,8 +6444,8 @@ out_unlock:
 	if (!ret)
 		return VM_FAULT_LOCKED;
 	unlock_page(page);
-	btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
 out:
+	btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
 	return ret;
 }