aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-07-14 16:02:04 -0400
committerJosef Bacik <josef@redhat.com>2011-10-19 15:12:28 -0400
commit0cbbdf7c9c46467bfb7129c30236f36a679ab244 (patch)
treeeb46b44f991d77fb7ee2e4eeab690a92af692189
parentf1bdcc0a8278aa42cb77331275890aac85a4e7cd (diff)
Btrfs: kill reserved_bytes in inode
reserved_bytes is not used for anything in the inode, remove it. Signed-off-by: Josef Bacik <josef@redhat.com>
-rw-r--r--fs/btrfs/btrfs_inode.h5
-rw-r--r--fs/btrfs/extent-tree.c2
-rw-r--r--fs/btrfs/inode.c1
3 files changed, 0 insertions, 8 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index bf325f40cf92..c70fb10a307b 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -103,11 +103,6 @@ struct btrfs_inode {
103 */ 103 */
104 u64 delalloc_bytes; 104 u64 delalloc_bytes;
105 105
106 /* total number of bytes that may be used for this inode for
107 * delalloc
108 */
109 u64 reserved_bytes;
110
111 /* 106 /*
112 * the size of the file stored in the metadata on disk. data=ordered 107 * the size of the file stored in the metadata on disk. data=ordered
113 * means the in-memory i_size might be larger than the size on disk 108 * means the in-memory i_size might be larger than the size on disk
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f5be06a2462f..03edac4f7771 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3122,7 +3122,6 @@ commit_trans:
3122 return -ENOSPC; 3122 return -ENOSPC;
3123 } 3123 }
3124 data_sinfo->bytes_may_use += bytes; 3124 data_sinfo->bytes_may_use += bytes;
3125 BTRFS_I(inode)->reserved_bytes += bytes;
3126 spin_unlock(&data_sinfo->lock); 3125 spin_unlock(&data_sinfo->lock);
3127 3126
3128 return 0; 3127 return 0;
@@ -3144,7 +3143,6 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes)
3144 data_sinfo = BTRFS_I(inode)->space_info; 3143 data_sinfo = BTRFS_I(inode)->space_info;
3145 spin_lock(&data_sinfo->lock); 3144 spin_lock(&data_sinfo->lock);
3146 data_sinfo->bytes_may_use -= bytes; 3145 data_sinfo->bytes_may_use -= bytes;
3147 BTRFS_I(inode)->reserved_bytes -= bytes;
3148 spin_unlock(&data_sinfo->lock); 3146 spin_unlock(&data_sinfo->lock);
3149} 3147}
3150 3148
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b2d004ad66a0..156c3a0da792 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6755,7 +6755,6 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
6755 ei->last_sub_trans = 0; 6755 ei->last_sub_trans = 0;
6756 ei->logged_trans = 0; 6756 ei->logged_trans = 0;
6757 ei->delalloc_bytes = 0; 6757 ei->delalloc_bytes = 0;
6758 ei->reserved_bytes = 0;
6759 ei->disk_i_size = 0; 6758 ei->disk_i_size = 0;
6760 ei->flags = 0; 6759 ei->flags = 0;
6761 ei->index_cnt = (u64)-1; 6760 ei->index_cnt = (u64)-1;