1 ext4: remove unused metadata accounting variables
3 From: Eric Whitney <enwlinux@gmail.com>
5 Two variables in ext4_inode_info, i_reserved_meta_blocks and
6 i_allocated_meta_blocks, are unused. Removing them saves a little
7 memory per in-memory inode and cleans up clutter in several tracepoints.
8 Adjust tracepoint output from ext4_alloc_da_blocks() for consistency
9 and fix a typo and whitespace near these changes.
11 Signed-off-by: Eric Whitney <enwlinux@gmail.com>
12 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
13 Reviewed-by: Jan Kara <jack@suse.cz>
15 fs/ext4/ext4.h | 6 ++----
16 fs/ext4/super.c | 2 --
17 include/trace/events/ext4.h | 35 ++++++++---------------------------
18 3 files changed, 10 insertions(+), 33 deletions(-)
20 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
21 index 9ebde0c..dcbcd9d 100644
24 @@ -961,7 +961,7 @@ struct ext4_inode_info {
26 * i_block_group is the number of the block group which contains
27 * this file's inode. Constant across the lifetime of the inode,
28 - * it is ued for making block allocation decisions - we try to
29 + * it is used for making block allocation decisions - we try to
30 * place a file's data blocks near its inode block, and new inodes
31 * near to their parent directory's inode.
33 @@ -1049,10 +1049,8 @@ struct ext4_inode_info {
34 ext4_group_t i_last_alloc_group;
36 /* allocation reservation info for delalloc */
37 - /* In case of bigalloc, these refer to clusters rather than blocks */
38 + /* In case of bigalloc, this refer to clusters rather than blocks */
39 unsigned int i_reserved_data_blocks;
40 - unsigned int i_reserved_meta_blocks;
41 - unsigned int i_allocated_meta_blocks;
42 ext4_lblk_t i_da_metadata_calc_last_lblock;
43 int i_da_metadata_calc_len;
45 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
46 index f666042..94722df 100644
49 @@ -978,8 +978,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
51 ei->i_es_shrink_lblk = 0;
52 ei->i_reserved_data_blocks = 0;
53 - ei->i_reserved_meta_blocks = 0;
54 - ei->i_allocated_meta_blocks = 0;
55 ei->i_da_metadata_calc_len = 0;
56 ei->i_da_metadata_calc_last_lblock = 0;
57 spin_lock_init(&(ei->i_block_reservation_lock));
58 diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
59 index dfae175..9c3bc38 100644
60 --- a/include/trace/events/ext4.h
61 +++ b/include/trace/events/ext4.h
62 @@ -937,21 +937,19 @@ TRACE_EVENT(ext4_alloc_da_blocks,
66 - __field( unsigned int, data_blocks )
67 - __field( unsigned int, meta_blocks )
68 + __field( unsigned int, data_blocks )
72 __entry->dev = inode->i_sb->s_dev;
73 __entry->ino = inode->i_ino;
74 __entry->data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
75 - __entry->meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
78 - TP_printk("dev %d,%d ino %lu data_blocks %u meta_blocks %u",
79 + TP_printk("dev %d,%d ino %lu reserved_data_blocks %u",
80 MAJOR(__entry->dev), MINOR(__entry->dev),
81 (unsigned long) __entry->ino,
82 - __entry->data_blocks, __entry->meta_blocks)
83 + __entry->data_blocks)
86 TRACE_EVENT(ext4_mballoc_alloc,
87 @@ -1153,8 +1151,6 @@ TRACE_EVENT(ext4_da_update_reserve_space,
88 __field( __u64, i_blocks )
89 __field( int, used_blocks )
90 __field( int, reserved_data_blocks )
91 - __field( int, reserved_meta_blocks )
92 - __field( int, allocated_meta_blocks )
93 __field( int, quota_claim )
94 __field( __u16, mode )
96 @@ -1166,22 +1162,16 @@ TRACE_EVENT(ext4_da_update_reserve_space,
97 __entry->used_blocks = used_blocks;
98 __entry->reserved_data_blocks =
99 EXT4_I(inode)->i_reserved_data_blocks;
100 - __entry->reserved_meta_blocks =
101 - EXT4_I(inode)->i_reserved_meta_blocks;
102 - __entry->allocated_meta_blocks =
103 - EXT4_I(inode)->i_allocated_meta_blocks;
104 __entry->quota_claim = quota_claim;
105 __entry->mode = inode->i_mode;
108 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
109 - "reserved_data_blocks %d reserved_meta_blocks %d "
110 - "allocated_meta_blocks %d quota_claim %d",
111 + "reserved_data_blocks %d quota_claim %d",
112 MAJOR(__entry->dev), MINOR(__entry->dev),
113 (unsigned long) __entry->ino,
114 __entry->mode, __entry->i_blocks,
115 __entry->used_blocks, __entry->reserved_data_blocks,
116 - __entry->reserved_meta_blocks, __entry->allocated_meta_blocks,
117 __entry->quota_claim)
120 @@ -1195,7 +1185,6 @@ TRACE_EVENT(ext4_da_reserve_space,
121 __field( ino_t, ino )
122 __field( __u64, i_blocks )
123 __field( int, reserved_data_blocks )
124 - __field( int, reserved_meta_blocks )
125 __field( __u16, mode )
128 @@ -1204,17 +1193,15 @@ TRACE_EVENT(ext4_da_reserve_space,
129 __entry->ino = inode->i_ino;
130 __entry->i_blocks = inode->i_blocks;
131 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
132 - __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
133 __entry->mode = inode->i_mode;
136 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu "
137 - "reserved_data_blocks %d reserved_meta_blocks %d",
138 + "reserved_data_blocks %d",
139 MAJOR(__entry->dev), MINOR(__entry->dev),
140 (unsigned long) __entry->ino,
141 __entry->mode, __entry->i_blocks,
142 - __entry->reserved_data_blocks,
143 - __entry->reserved_meta_blocks)
144 + __entry->reserved_data_blocks)
147 TRACE_EVENT(ext4_da_release_space,
148 @@ -1228,8 +1215,6 @@ TRACE_EVENT(ext4_da_release_space,
149 __field( __u64, i_blocks )
150 __field( int, freed_blocks )
151 __field( int, reserved_data_blocks )
152 - __field( int, reserved_meta_blocks )
153 - __field( int, allocated_meta_blocks )
154 __field( __u16, mode )
157 @@ -1239,19 +1224,15 @@ TRACE_EVENT(ext4_da_release_space,
158 __entry->i_blocks = inode->i_blocks;
159 __entry->freed_blocks = freed_blocks;
160 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
161 - __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
162 - __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
163 __entry->mode = inode->i_mode;
166 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d "
167 - "reserved_data_blocks %d reserved_meta_blocks %d "
168 - "allocated_meta_blocks %d",
169 + "reserved_data_blocks %d",
170 MAJOR(__entry->dev), MINOR(__entry->dev),
171 (unsigned long) __entry->ino,
172 __entry->mode, __entry->i_blocks,
173 - __entry->freed_blocks, __entry->reserved_data_blocks,
174 - __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
175 + __entry->freed_blocks, __entry->reserved_data_blocks)
178 DECLARE_EVENT_CLASS(ext4__bitmap_load,