From ca2f2699984dcf92d5917d5a63ad7d5dcda181ff Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Thu, 14 Jul 2011 16:02:04 -0400
Subject: [PATCH] --- yaml --- r: 274602 b: refs/heads/master c:
 0cbbdf7c9c46467bfb7129c30236f36a679ab244 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/btrfs_inode.h | 5 -----
 trunk/fs/btrfs/extent-tree.c | 2 --
 trunk/fs/btrfs/inode.c       | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index a1045cec9308..6290783245ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1bdcc0a8278aa42cb77331275890aac85a4e7cd
+refs/heads/master: 0cbbdf7c9c46467bfb7129c30236f36a679ab244
diff --git a/trunk/fs/btrfs/btrfs_inode.h b/trunk/fs/btrfs/btrfs_inode.h
index bf325f40cf92..c70fb10a307b 100644
--- a/trunk/fs/btrfs/btrfs_inode.h
+++ b/trunk/fs/btrfs/btrfs_inode.h
@@ -103,11 +103,6 @@ struct btrfs_inode {
 	 */
 	u64 delalloc_bytes;
 
-	/* total number of bytes that may be used for this inode for
-	 * delalloc
-	 */
-	u64 reserved_bytes;
-
 	/*
 	 * the size of the file stored in the metadata on disk.  data=ordered
 	 * means the in-memory i_size might be larger than the size on disk
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index f5be06a2462f..03edac4f7771 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -3122,7 +3122,6 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes)
 		return -ENOSPC;
 	}
 	data_sinfo->bytes_may_use += bytes;
-	BTRFS_I(inode)->reserved_bytes += bytes;
 	spin_unlock(&data_sinfo->lock);
 
 	return 0;
@@ -3144,7 +3143,6 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes)
 	data_sinfo = BTRFS_I(inode)->space_info;
 	spin_lock(&data_sinfo->lock);
 	data_sinfo->bytes_may_use -= bytes;
-	BTRFS_I(inode)->reserved_bytes -= bytes;
 	spin_unlock(&data_sinfo->lock);
 }
 
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index b2d004ad66a0..156c3a0da792 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -6755,7 +6755,6 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
 	ei->last_sub_trans = 0;
 	ei->logged_trans = 0;
 	ei->delalloc_bytes = 0;
-	ei->reserved_bytes = 0;
 	ei->disk_i_size = 0;
 	ei->flags = 0;
 	ei->index_cnt = (u64)-1;