1 // SPDX-License-Identifier: GPL-2.0 1 // SPDX-License-Identifier: GPL-2.0
2 /* 2 /*
3 * linux/fs/ext4/sysfs.c 3 * linux/fs/ext4/sysfs.c
4 * 4 *
5 * Copyright (C) 1992, 1993, 1994, 1995 5 * Copyright (C) 1992, 1993, 1994, 1995
6 * Remy Card (card@masi.ibp.fr) 6 * Remy Card (card@masi.ibp.fr)
7 * Theodore Ts'o (tytso@mit.edu) 7 * Theodore Ts'o (tytso@mit.edu)
8 * 8 *
9 */ 9 */
10 10
11 #include <linux/time.h> 11 #include <linux/time.h>
12 #include <linux/fs.h> 12 #include <linux/fs.h>
13 #include <linux/seq_file.h> 13 #include <linux/seq_file.h>
14 #include <linux/slab.h> 14 #include <linux/slab.h>
15 #include <linux/proc_fs.h> 15 #include <linux/proc_fs.h>
16 #include <linux/part_stat.h> 16 #include <linux/part_stat.h>
17 17
18 #include "ext4.h" 18 #include "ext4.h"
19 #include "ext4_jbd2.h" 19 #include "ext4_jbd2.h"
20 20
21 typedef enum { 21 typedef enum {
22 attr_noop, 22 attr_noop,
23 attr_delayed_allocation_blocks, 23 attr_delayed_allocation_blocks,
24 attr_session_write_kbytes, 24 attr_session_write_kbytes,
25 attr_lifetime_write_kbytes, 25 attr_lifetime_write_kbytes,
26 attr_reserved_clusters, 26 attr_reserved_clusters,
27 attr_sra_exceeded_retry_limit, 27 attr_sra_exceeded_retry_limit,
28 attr_inode_readahead, 28 attr_inode_readahead,
29 attr_trigger_test_error, 29 attr_trigger_test_error,
30 attr_first_error_time, 30 attr_first_error_time,
31 attr_last_error_time, 31 attr_last_error_time,
32 attr_clusters_in_group, <<
33 attr_mb_order, <<
34 attr_feature, 32 attr_feature,
35 attr_pointer_pi, <<
36 attr_pointer_ui, 33 attr_pointer_ui,
37 attr_pointer_ul, 34 attr_pointer_ul,
38 attr_pointer_u64, 35 attr_pointer_u64,
39 attr_pointer_u8, 36 attr_pointer_u8,
40 attr_pointer_string, 37 attr_pointer_string,
41 attr_pointer_atomic, 38 attr_pointer_atomic,
42 attr_journal_task, 39 attr_journal_task,
43 } attr_id_t; 40 } attr_id_t;
44 41
45 typedef enum { 42 typedef enum {
46 ptr_explicit, 43 ptr_explicit,
47 ptr_ext4_sb_info_offset, 44 ptr_ext4_sb_info_offset,
48 ptr_ext4_super_block_offset, 45 ptr_ext4_super_block_offset,
49 } attr_ptr_t; 46 } attr_ptr_t;
50 47
51 static const char proc_dirname[] = "fs/ext4"; 48 static const char proc_dirname[] = "fs/ext4";
52 static struct proc_dir_entry *ext4_proc_root; 49 static struct proc_dir_entry *ext4_proc_root;
53 50
54 struct ext4_attr { 51 struct ext4_attr {
55 struct attribute attr; 52 struct attribute attr;
56 short attr_id; 53 short attr_id;
57 short attr_ptr; 54 short attr_ptr;
58 unsigned short attr_size; 55 unsigned short attr_size;
59 union { 56 union {
60 int offset; 57 int offset;
61 void *explicit_ptr; 58 void *explicit_ptr;
62 } u; 59 } u;
63 }; 60 };
64 61
65 static ssize_t session_write_kbytes_show(struc 62 static ssize_t session_write_kbytes_show(struct ext4_sb_info *sbi, char *buf)
66 { 63 {
67 struct super_block *sb = sbi->s_buddy_ 64 struct super_block *sb = sbi->s_buddy_cache->i_sb;
68 65
69 return sysfs_emit(buf, "%lu\n", 66 return sysfs_emit(buf, "%lu\n",
70 (part_stat_read(sb->s_ 67 (part_stat_read(sb->s_bdev, sectors[STAT_WRITE]) -
71 sbi->s_sectors_writte 68 sbi->s_sectors_written_start) >> 1);
72 } 69 }
73 70
74 static ssize_t lifetime_write_kbytes_show(stru 71 static ssize_t lifetime_write_kbytes_show(struct ext4_sb_info *sbi, char *buf)
75 { 72 {
76 struct super_block *sb = sbi->s_buddy_ 73 struct super_block *sb = sbi->s_buddy_cache->i_sb;
77 74
78 return sysfs_emit(buf, "%llu\n", 75 return sysfs_emit(buf, "%llu\n",
79 (unsigned long long)(s 76 (unsigned long long)(sbi->s_kbytes_written +
80 ((part_stat_read(sb->s 77 ((part_stat_read(sb->s_bdev, sectors[STAT_WRITE]) -
81 EXT4_SB(sb)->s_secto 78 EXT4_SB(sb)->s_sectors_written_start) >> 1)));
82 } 79 }
83 80
84 static ssize_t inode_readahead_blks_store(stru 81 static ssize_t inode_readahead_blks_store(struct ext4_sb_info *sbi,
85 cons 82 const char *buf, size_t count)
86 { 83 {
87 unsigned long t; 84 unsigned long t;
88 int ret; 85 int ret;
89 86
90 ret = kstrtoul(skip_spaces(buf), 0, &t 87 ret = kstrtoul(skip_spaces(buf), 0, &t);
91 if (ret) 88 if (ret)
92 return ret; 89 return ret;
93 90
94 if (t && (!is_power_of_2(t) || t > 0x4 91 if (t && (!is_power_of_2(t) || t > 0x40000000))
95 return -EINVAL; 92 return -EINVAL;
96 93
97 sbi->s_inode_readahead_blks = t; 94 sbi->s_inode_readahead_blks = t;
98 return count; 95 return count;
99 } 96 }
100 97
101 static ssize_t reserved_clusters_store(struct 98 static ssize_t reserved_clusters_store(struct ext4_sb_info *sbi,
102 const char 99 const char *buf, size_t count)
103 { 100 {
104 unsigned long long val; 101 unsigned long long val;
105 ext4_fsblk_t clusters = (ext4_blocks_c 102 ext4_fsblk_t clusters = (ext4_blocks_count(sbi->s_es) >>
106 sbi->s_cluste 103 sbi->s_cluster_bits);
107 int ret; 104 int ret;
108 105
109 ret = kstrtoull(skip_spaces(buf), 0, & 106 ret = kstrtoull(skip_spaces(buf), 0, &val);
110 if (ret || val >= clusters || (s64)val !! 107 if (ret || val >= clusters)
111 return -EINVAL; 108 return -EINVAL;
112 109
113 atomic64_set(&sbi->s_resv_clusters, va 110 atomic64_set(&sbi->s_resv_clusters, val);
114 return count; 111 return count;
115 } 112 }
116 113
117 static ssize_t trigger_test_error(struct ext4_ 114 static ssize_t trigger_test_error(struct ext4_sb_info *sbi,
118 const char * 115 const char *buf, size_t count)
119 { 116 {
120 int len = count; 117 int len = count;
121 118
122 if (!capable(CAP_SYS_ADMIN)) 119 if (!capable(CAP_SYS_ADMIN))
123 return -EPERM; 120 return -EPERM;
124 121
125 if (len && buf[len-1] == '\n') 122 if (len && buf[len-1] == '\n')
126 len--; 123 len--;
127 124
128 if (len) 125 if (len)
129 ext4_error(sbi->s_sb, "%.*s", 126 ext4_error(sbi->s_sb, "%.*s", len, buf);
130 return count; 127 return count;
131 } 128 }
132 129
133 static ssize_t journal_task_show(struct ext4_s 130 static ssize_t journal_task_show(struct ext4_sb_info *sbi, char *buf)
134 { 131 {
135 if (!sbi->s_journal) 132 if (!sbi->s_journal)
136 return sysfs_emit(buf, "<none> 133 return sysfs_emit(buf, "<none>\n");
137 return sysfs_emit(buf, "%d\n", 134 return sysfs_emit(buf, "%d\n",
138 task_pid_vnr(sbi->s_jo 135 task_pid_vnr(sbi->s_journal->j_task));
139 } 136 }
140 137
141 #define EXT4_ATTR(_name,_mode,_id) 138 #define EXT4_ATTR(_name,_mode,_id) \
142 static struct ext4_attr ext4_attr_##_name = { 139 static struct ext4_attr ext4_attr_##_name = { \
143 .attr = {.name = __stringify(_name), . 140 .attr = {.name = __stringify(_name), .mode = _mode }, \
144 .attr_id = attr_##_id, 141 .attr_id = attr_##_id, \
145 } 142 }
146 143
147 #define EXT4_ATTR_FUNC(_name,_mode) EXT4_ATTR 144 #define EXT4_ATTR_FUNC(_name,_mode) EXT4_ATTR(_name,_mode,_name)
148 145
149 #define EXT4_ATTR_FEATURE(_name) EXT4_ATTR(_ 146 #define EXT4_ATTR_FEATURE(_name) EXT4_ATTR(_name, 0444, feature)
150 147
151 #define EXT4_ATTR_OFFSET(_name,_mode,_id,_stru 148 #define EXT4_ATTR_OFFSET(_name,_mode,_id,_struct,_elname) \
152 static struct ext4_attr ext4_attr_##_name = { 149 static struct ext4_attr ext4_attr_##_name = { \
153 .attr = {.name = __stringify(_name), . 150 .attr = {.name = __stringify(_name), .mode = _mode }, \
154 .attr_id = attr_##_id, 151 .attr_id = attr_##_id, \
155 .attr_ptr = ptr_##_struct##_offset, 152 .attr_ptr = ptr_##_struct##_offset, \
156 .u = { 153 .u = { \
157 .offset = offsetof(struct _str 154 .offset = offsetof(struct _struct, _elname),\
158 }, 155 }, \
159 } 156 }
160 157
161 #define EXT4_ATTR_STRING(_name,_mode,_size,_st 158 #define EXT4_ATTR_STRING(_name,_mode,_size,_struct,_elname) \
162 static struct ext4_attr ext4_attr_##_name = { 159 static struct ext4_attr ext4_attr_##_name = { \
163 .attr = {.name = __stringify(_name), . 160 .attr = {.name = __stringify(_name), .mode = _mode }, \
164 .attr_id = attr_pointer_string, 161 .attr_id = attr_pointer_string, \
165 .attr_size = _size, 162 .attr_size = _size, \
166 .attr_ptr = ptr_##_struct##_offset, 163 .attr_ptr = ptr_##_struct##_offset, \
167 .u = { 164 .u = { \
168 .offset = offsetof(struct _str 165 .offset = offsetof(struct _struct, _elname),\
169 }, 166 }, \
170 } 167 }
171 168
172 #define EXT4_RO_ATTR_ES_UI(_name,_elname) 169 #define EXT4_RO_ATTR_ES_UI(_name,_elname) \
173 EXT4_ATTR_OFFSET(_name, 0444, pointer_ 170 EXT4_ATTR_OFFSET(_name, 0444, pointer_ui, ext4_super_block, _elname)
174 171
175 #define EXT4_RO_ATTR_ES_U8(_name,_elname) 172 #define EXT4_RO_ATTR_ES_U8(_name,_elname) \
176 EXT4_ATTR_OFFSET(_name, 0444, pointer_ 173 EXT4_ATTR_OFFSET(_name, 0444, pointer_u8, ext4_super_block, _elname)
177 174
178 #define EXT4_RO_ATTR_ES_U64(_name,_elname) 175 #define EXT4_RO_ATTR_ES_U64(_name,_elname) \
179 EXT4_ATTR_OFFSET(_name, 0444, pointer_ 176 EXT4_ATTR_OFFSET(_name, 0444, pointer_u64, ext4_super_block, _elname)
180 177
181 #define EXT4_RO_ATTR_ES_STRING(_name,_elname,_ 178 #define EXT4_RO_ATTR_ES_STRING(_name,_elname,_size) \
182 EXT4_ATTR_STRING(_name, 0444, _size, e 179 EXT4_ATTR_STRING(_name, 0444, _size, ext4_super_block, _elname)
183 180
184 #define EXT4_RW_ATTR_SBI_PI(_name,_elname) <<
185 EXT4_ATTR_OFFSET(_name, 0644, pointer_ <<
186 <<
187 #define EXT4_RW_ATTR_SBI_UI(_name,_elname) 181 #define EXT4_RW_ATTR_SBI_UI(_name,_elname) \
188 EXT4_ATTR_OFFSET(_name, 0644, pointer_ 182 EXT4_ATTR_OFFSET(_name, 0644, pointer_ui, ext4_sb_info, _elname)
189 183
190 #define EXT4_RW_ATTR_SBI_UL(_name,_elname) 184 #define EXT4_RW_ATTR_SBI_UL(_name,_elname) \
191 EXT4_ATTR_OFFSET(_name, 0644, pointer_ 185 EXT4_ATTR_OFFSET(_name, 0644, pointer_ul, ext4_sb_info, _elname)
192 186
193 #define EXT4_RO_ATTR_SBI_ATOMIC(_name,_elname) 187 #define EXT4_RO_ATTR_SBI_ATOMIC(_name,_elname) \
194 EXT4_ATTR_OFFSET(_name, 0444, pointer_ 188 EXT4_ATTR_OFFSET(_name, 0444, pointer_atomic, ext4_sb_info, _elname)
195 189
196 #define EXT4_ATTR_PTR(_name,_mode,_id,_ptr) \ 190 #define EXT4_ATTR_PTR(_name,_mode,_id,_ptr) \
197 static struct ext4_attr ext4_attr_##_name = { 191 static struct ext4_attr ext4_attr_##_name = { \
198 .attr = {.name = __stringify(_name), . 192 .attr = {.name = __stringify(_name), .mode = _mode }, \
199 .attr_id = attr_##_id, 193 .attr_id = attr_##_id, \
200 .attr_ptr = ptr_explicit, 194 .attr_ptr = ptr_explicit, \
201 .u = { 195 .u = { \
202 .explicit_ptr = _ptr, 196 .explicit_ptr = _ptr, \
203 }, 197 }, \
204 } 198 }
205 199
206 #define ATTR_LIST(name) &ext4_attr_##name.attr 200 #define ATTR_LIST(name) &ext4_attr_##name.attr
207 201
208 EXT4_ATTR_FUNC(delayed_allocation_blocks, 0444 202 EXT4_ATTR_FUNC(delayed_allocation_blocks, 0444);
209 EXT4_ATTR_FUNC(session_write_kbytes, 0444); 203 EXT4_ATTR_FUNC(session_write_kbytes, 0444);
210 EXT4_ATTR_FUNC(lifetime_write_kbytes, 0444); 204 EXT4_ATTR_FUNC(lifetime_write_kbytes, 0444);
211 EXT4_ATTR_FUNC(reserved_clusters, 0644); 205 EXT4_ATTR_FUNC(reserved_clusters, 0644);
212 EXT4_ATTR_FUNC(sra_exceeded_retry_limit, 0444) 206 EXT4_ATTR_FUNC(sra_exceeded_retry_limit, 0444);
213 207
214 EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, i 208 EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, inode_readahead,
215 ext4_sb_info, s_inode_readahe 209 ext4_sb_info, s_inode_readahead_blks);
216 EXT4_ATTR_OFFSET(mb_group_prealloc, 0644, clus <<
217 ext4_sb_info, s_mb_group_prea <<
218 EXT4_ATTR_OFFSET(mb_best_avail_max_trim_order, <<
219 ext4_sb_info, s_mb_best_avail <<
220 EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal); 210 EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal);
221 EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats); 211 EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats);
222 EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_t 212 EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan);
223 EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_t 213 EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);
224 EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2 214 EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs);
225 EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream 215 EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request);
>> 216 EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc);
226 EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb 217 EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups);
227 EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_e 218 EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb);
228 EXT4_ATTR(trigger_fs_error, 0200, trigger_test 219 EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error);
229 EXT4_RW_ATTR_SBI_PI(err_ratelimit_interval_ms, !! 220 EXT4_RW_ATTR_SBI_UI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
230 EXT4_RW_ATTR_SBI_PI(err_ratelimit_burst, s_err !! 221 EXT4_RW_ATTR_SBI_UI(err_ratelimit_burst, s_err_ratelimit_state.burst);
231 EXT4_RW_ATTR_SBI_PI(warning_ratelimit_interval !! 222 EXT4_RW_ATTR_SBI_UI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);
232 EXT4_RW_ATTR_SBI_PI(warning_ratelimit_burst, s !! 223 EXT4_RW_ATTR_SBI_UI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);
233 EXT4_RW_ATTR_SBI_PI(msg_ratelimit_interval_ms, !! 224 EXT4_RW_ATTR_SBI_UI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);
234 EXT4_RW_ATTR_SBI_PI(msg_ratelimit_burst, s_msg !! 225 EXT4_RW_ATTR_SBI_UI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);
>> 226 EXT4_RW_ATTR_SBI_UI(mb_best_avail_max_trim_order, s_mb_best_avail_max_trim_order);
235 #ifdef CONFIG_EXT4_DEBUG 227 #ifdef CONFIG_EXT4_DEBUG
236 EXT4_RW_ATTR_SBI_UL(simulate_fail, s_simulate_ 228 EXT4_RW_ATTR_SBI_UL(simulate_fail, s_simulate_fail);
237 #endif 229 #endif
238 EXT4_RO_ATTR_SBI_ATOMIC(warning_count, s_warni 230 EXT4_RO_ATTR_SBI_ATOMIC(warning_count, s_warning_count);
239 EXT4_RO_ATTR_SBI_ATOMIC(msg_count, s_msg_count 231 EXT4_RO_ATTR_SBI_ATOMIC(msg_count, s_msg_count);
240 EXT4_RO_ATTR_ES_UI(errors_count, s_error_count 232 EXT4_RO_ATTR_ES_UI(errors_count, s_error_count);
241 EXT4_RO_ATTR_ES_U8(first_error_errcode, s_firs 233 EXT4_RO_ATTR_ES_U8(first_error_errcode, s_first_error_errcode);
242 EXT4_RO_ATTR_ES_U8(last_error_errcode, s_last_ 234 EXT4_RO_ATTR_ES_U8(last_error_errcode, s_last_error_errcode);
243 EXT4_RO_ATTR_ES_UI(first_error_ino, s_first_er 235 EXT4_RO_ATTR_ES_UI(first_error_ino, s_first_error_ino);
244 EXT4_RO_ATTR_ES_UI(last_error_ino, s_last_erro 236 EXT4_RO_ATTR_ES_UI(last_error_ino, s_last_error_ino);
245 EXT4_RO_ATTR_ES_U64(first_error_block, s_first 237 EXT4_RO_ATTR_ES_U64(first_error_block, s_first_error_block);
246 EXT4_RO_ATTR_ES_U64(last_error_block, s_last_e 238 EXT4_RO_ATTR_ES_U64(last_error_block, s_last_error_block);
247 EXT4_RO_ATTR_ES_UI(first_error_line, s_first_e 239 EXT4_RO_ATTR_ES_UI(first_error_line, s_first_error_line);
248 EXT4_RO_ATTR_ES_UI(last_error_line, s_last_err 240 EXT4_RO_ATTR_ES_UI(last_error_line, s_last_error_line);
249 EXT4_RO_ATTR_ES_STRING(first_error_func, s_fir 241 EXT4_RO_ATTR_ES_STRING(first_error_func, s_first_error_func, 32);
250 EXT4_RO_ATTR_ES_STRING(last_error_func, s_last 242 EXT4_RO_ATTR_ES_STRING(last_error_func, s_last_error_func, 32);
251 EXT4_ATTR(first_error_time, 0444, first_error_ 243 EXT4_ATTR(first_error_time, 0444, first_error_time);
252 EXT4_ATTR(last_error_time, 0444, last_error_ti 244 EXT4_ATTR(last_error_time, 0444, last_error_time);
253 EXT4_ATTR(journal_task, 0444, journal_task); 245 EXT4_ATTR(journal_task, 0444, journal_task);
254 EXT4_RW_ATTR_SBI_UI(mb_prefetch, s_mb_prefetch 246 EXT4_RW_ATTR_SBI_UI(mb_prefetch, s_mb_prefetch);
255 EXT4_RW_ATTR_SBI_UI(mb_prefetch_limit, s_mb_pr 247 EXT4_RW_ATTR_SBI_UI(mb_prefetch_limit, s_mb_prefetch_limit);
256 EXT4_RW_ATTR_SBI_UL(last_trim_minblks, s_last_ 248 EXT4_RW_ATTR_SBI_UL(last_trim_minblks, s_last_trim_minblks);
257 249
258 static unsigned int old_bump_val = 128; 250 static unsigned int old_bump_val = 128;
259 EXT4_ATTR_PTR(max_writeback_mb_bump, 0444, poi 251 EXT4_ATTR_PTR(max_writeback_mb_bump, 0444, pointer_ui, &old_bump_val);
260 252
261 static struct attribute *ext4_attrs[] = { 253 static struct attribute *ext4_attrs[] = {
262 ATTR_LIST(delayed_allocation_blocks), 254 ATTR_LIST(delayed_allocation_blocks),
263 ATTR_LIST(session_write_kbytes), 255 ATTR_LIST(session_write_kbytes),
264 ATTR_LIST(lifetime_write_kbytes), 256 ATTR_LIST(lifetime_write_kbytes),
265 ATTR_LIST(reserved_clusters), 257 ATTR_LIST(reserved_clusters),
266 ATTR_LIST(sra_exceeded_retry_limit), 258 ATTR_LIST(sra_exceeded_retry_limit),
267 ATTR_LIST(inode_readahead_blks), 259 ATTR_LIST(inode_readahead_blks),
268 ATTR_LIST(inode_goal), 260 ATTR_LIST(inode_goal),
269 ATTR_LIST(mb_stats), 261 ATTR_LIST(mb_stats),
270 ATTR_LIST(mb_max_to_scan), 262 ATTR_LIST(mb_max_to_scan),
271 ATTR_LIST(mb_min_to_scan), 263 ATTR_LIST(mb_min_to_scan),
272 ATTR_LIST(mb_order2_req), 264 ATTR_LIST(mb_order2_req),
273 ATTR_LIST(mb_stream_req), 265 ATTR_LIST(mb_stream_req),
274 ATTR_LIST(mb_group_prealloc), 266 ATTR_LIST(mb_group_prealloc),
275 ATTR_LIST(mb_max_linear_groups), 267 ATTR_LIST(mb_max_linear_groups),
276 ATTR_LIST(max_writeback_mb_bump), 268 ATTR_LIST(max_writeback_mb_bump),
277 ATTR_LIST(extent_max_zeroout_kb), 269 ATTR_LIST(extent_max_zeroout_kb),
278 ATTR_LIST(trigger_fs_error), 270 ATTR_LIST(trigger_fs_error),
279 ATTR_LIST(err_ratelimit_interval_ms), 271 ATTR_LIST(err_ratelimit_interval_ms),
280 ATTR_LIST(err_ratelimit_burst), 272 ATTR_LIST(err_ratelimit_burst),
281 ATTR_LIST(warning_ratelimit_interval_m 273 ATTR_LIST(warning_ratelimit_interval_ms),
282 ATTR_LIST(warning_ratelimit_burst), 274 ATTR_LIST(warning_ratelimit_burst),
283 ATTR_LIST(msg_ratelimit_interval_ms), 275 ATTR_LIST(msg_ratelimit_interval_ms),
284 ATTR_LIST(msg_ratelimit_burst), 276 ATTR_LIST(msg_ratelimit_burst),
285 ATTR_LIST(mb_best_avail_max_trim_order 277 ATTR_LIST(mb_best_avail_max_trim_order),
286 ATTR_LIST(errors_count), 278 ATTR_LIST(errors_count),
287 ATTR_LIST(warning_count), 279 ATTR_LIST(warning_count),
288 ATTR_LIST(msg_count), 280 ATTR_LIST(msg_count),
289 ATTR_LIST(first_error_ino), 281 ATTR_LIST(first_error_ino),
290 ATTR_LIST(last_error_ino), 282 ATTR_LIST(last_error_ino),
291 ATTR_LIST(first_error_block), 283 ATTR_LIST(first_error_block),
292 ATTR_LIST(last_error_block), 284 ATTR_LIST(last_error_block),
293 ATTR_LIST(first_error_line), 285 ATTR_LIST(first_error_line),
294 ATTR_LIST(last_error_line), 286 ATTR_LIST(last_error_line),
295 ATTR_LIST(first_error_func), 287 ATTR_LIST(first_error_func),
296 ATTR_LIST(last_error_func), 288 ATTR_LIST(last_error_func),
297 ATTR_LIST(first_error_errcode), 289 ATTR_LIST(first_error_errcode),
298 ATTR_LIST(last_error_errcode), 290 ATTR_LIST(last_error_errcode),
299 ATTR_LIST(first_error_time), 291 ATTR_LIST(first_error_time),
300 ATTR_LIST(last_error_time), 292 ATTR_LIST(last_error_time),
301 ATTR_LIST(journal_task), 293 ATTR_LIST(journal_task),
302 #ifdef CONFIG_EXT4_DEBUG 294 #ifdef CONFIG_EXT4_DEBUG
303 ATTR_LIST(simulate_fail), 295 ATTR_LIST(simulate_fail),
304 #endif 296 #endif
305 ATTR_LIST(mb_prefetch), 297 ATTR_LIST(mb_prefetch),
306 ATTR_LIST(mb_prefetch_limit), 298 ATTR_LIST(mb_prefetch_limit),
307 ATTR_LIST(last_trim_minblks), 299 ATTR_LIST(last_trim_minblks),
308 NULL, 300 NULL,
309 }; 301 };
310 ATTRIBUTE_GROUPS(ext4); 302 ATTRIBUTE_GROUPS(ext4);
311 303
312 /* Features this copy of ext4 supports */ 304 /* Features this copy of ext4 supports */
313 EXT4_ATTR_FEATURE(lazy_itable_init); 305 EXT4_ATTR_FEATURE(lazy_itable_init);
314 EXT4_ATTR_FEATURE(batched_discard); 306 EXT4_ATTR_FEATURE(batched_discard);
315 EXT4_ATTR_FEATURE(meta_bg_resize); 307 EXT4_ATTR_FEATURE(meta_bg_resize);
316 #ifdef CONFIG_FS_ENCRYPTION 308 #ifdef CONFIG_FS_ENCRYPTION
317 EXT4_ATTR_FEATURE(encryption); 309 EXT4_ATTR_FEATURE(encryption);
318 EXT4_ATTR_FEATURE(test_dummy_encryption_v2); 310 EXT4_ATTR_FEATURE(test_dummy_encryption_v2);
319 #endif 311 #endif
320 #if IS_ENABLED(CONFIG_UNICODE) 312 #if IS_ENABLED(CONFIG_UNICODE)
321 EXT4_ATTR_FEATURE(casefold); 313 EXT4_ATTR_FEATURE(casefold);
322 #endif 314 #endif
323 #ifdef CONFIG_FS_VERITY 315 #ifdef CONFIG_FS_VERITY
324 EXT4_ATTR_FEATURE(verity); 316 EXT4_ATTR_FEATURE(verity);
325 #endif 317 #endif
326 EXT4_ATTR_FEATURE(metadata_csum_seed); 318 EXT4_ATTR_FEATURE(metadata_csum_seed);
327 EXT4_ATTR_FEATURE(fast_commit); 319 EXT4_ATTR_FEATURE(fast_commit);
328 #if IS_ENABLED(CONFIG_UNICODE) && defined(CONF 320 #if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
329 EXT4_ATTR_FEATURE(encrypted_casefold); 321 EXT4_ATTR_FEATURE(encrypted_casefold);
330 #endif 322 #endif
331 323
332 static struct attribute *ext4_feat_attrs[] = { 324 static struct attribute *ext4_feat_attrs[] = {
333 ATTR_LIST(lazy_itable_init), 325 ATTR_LIST(lazy_itable_init),
334 ATTR_LIST(batched_discard), 326 ATTR_LIST(batched_discard),
335 ATTR_LIST(meta_bg_resize), 327 ATTR_LIST(meta_bg_resize),
336 #ifdef CONFIG_FS_ENCRYPTION 328 #ifdef CONFIG_FS_ENCRYPTION
337 ATTR_LIST(encryption), 329 ATTR_LIST(encryption),
338 ATTR_LIST(test_dummy_encryption_v2), 330 ATTR_LIST(test_dummy_encryption_v2),
339 #endif 331 #endif
340 #if IS_ENABLED(CONFIG_UNICODE) 332 #if IS_ENABLED(CONFIG_UNICODE)
341 ATTR_LIST(casefold), 333 ATTR_LIST(casefold),
342 #endif 334 #endif
343 #ifdef CONFIG_FS_VERITY 335 #ifdef CONFIG_FS_VERITY
344 ATTR_LIST(verity), 336 ATTR_LIST(verity),
345 #endif 337 #endif
346 ATTR_LIST(metadata_csum_seed), 338 ATTR_LIST(metadata_csum_seed),
347 ATTR_LIST(fast_commit), 339 ATTR_LIST(fast_commit),
348 #if IS_ENABLED(CONFIG_UNICODE) && defined(CONF 340 #if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
349 ATTR_LIST(encrypted_casefold), 341 ATTR_LIST(encrypted_casefold),
350 #endif 342 #endif
351 NULL, 343 NULL,
352 }; 344 };
353 ATTRIBUTE_GROUPS(ext4_feat); 345 ATTRIBUTE_GROUPS(ext4_feat);
354 346
355 static void *calc_ptr(struct ext4_attr *a, str 347 static void *calc_ptr(struct ext4_attr *a, struct ext4_sb_info *sbi)
356 { 348 {
357 switch (a->attr_ptr) { 349 switch (a->attr_ptr) {
358 case ptr_explicit: 350 case ptr_explicit:
359 return a->u.explicit_ptr; 351 return a->u.explicit_ptr;
360 case ptr_ext4_sb_info_offset: 352 case ptr_ext4_sb_info_offset:
361 return (void *) (((char *) sbi 353 return (void *) (((char *) sbi) + a->u.offset);
362 case ptr_ext4_super_block_offset: 354 case ptr_ext4_super_block_offset:
363 return (void *) (((char *) sbi 355 return (void *) (((char *) sbi->s_es) + a->u.offset);
364 } 356 }
365 return NULL; 357 return NULL;
366 } 358 }
367 359
368 static ssize_t __print_tstamp(char *buf, __le3 360 static ssize_t __print_tstamp(char *buf, __le32 lo, __u8 hi)
369 { 361 {
370 return sysfs_emit(buf, "%lld\n", 362 return sysfs_emit(buf, "%lld\n",
371 ((time64_t)hi << 32) + 363 ((time64_t)hi << 32) + le32_to_cpu(lo));
372 } 364 }
373 365
374 #define print_tstamp(buf, es, tstamp) \ 366 #define print_tstamp(buf, es, tstamp) \
375 __print_tstamp(buf, (es)->tstamp, (es) 367 __print_tstamp(buf, (es)->tstamp, (es)->tstamp ## _hi)
376 368
377 static ssize_t ext4_generic_attr_show(struct e <<
378 struct e <<
379 { <<
380 void *ptr = calc_ptr(a, sbi); <<
381 <<
382 if (!ptr) <<
383 return 0; <<
384 <<
385 switch (a->attr_id) { <<
386 case attr_inode_readahead: <<
387 case attr_clusters_in_group: <<
388 case attr_mb_order: <<
389 case attr_pointer_pi: <<
390 case attr_pointer_ui: <<
391 if (a->attr_ptr == ptr_ext4_su <<
392 return sysfs_emit(buf, <<
393 return sysfs_emit(buf, "%u\n", <<
394 case attr_pointer_ul: <<
395 return sysfs_emit(buf, "%lu\n" <<
396 case attr_pointer_u8: <<
397 return sysfs_emit(buf, "%u\n", <<
398 case attr_pointer_u64: <<
399 if (a->attr_ptr == ptr_ext4_su <<
400 return sysfs_emit(buf, <<
401 return sysfs_emit(buf, "%llu\n <<
402 case attr_pointer_string: <<
403 return sysfs_emit(buf, "%.*s\n <<
404 case attr_pointer_atomic: <<
405 return sysfs_emit(buf, "%d\n", <<
406 } <<
407 return 0; <<
408 } <<
409 <<
410 static ssize_t ext4_attr_show(struct kobject * 369 static ssize_t ext4_attr_show(struct kobject *kobj,
411 struct attribute 370 struct attribute *attr, char *buf)
412 { 371 {
413 struct ext4_sb_info *sbi = container_o 372 struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,
414 373 s_kobj);
415 struct ext4_attr *a = container_of(att 374 struct ext4_attr *a = container_of(attr, struct ext4_attr, attr);
>> 375 void *ptr = calc_ptr(a, sbi);
416 376
417 switch (a->attr_id) { 377 switch (a->attr_id) {
418 case attr_delayed_allocation_blocks: 378 case attr_delayed_allocation_blocks:
419 return sysfs_emit(buf, "%llu\n 379 return sysfs_emit(buf, "%llu\n",
420 (s64) EXT4_C2B 380 (s64) EXT4_C2B(sbi,
421 percpu_counter_sum(&sbi 381 percpu_counter_sum(&sbi->s_dirtyclusters_counter)));
422 case attr_session_write_kbytes: 382 case attr_session_write_kbytes:
423 return session_write_kbytes_sh 383 return session_write_kbytes_show(sbi, buf);
424 case attr_lifetime_write_kbytes: 384 case attr_lifetime_write_kbytes:
425 return lifetime_write_kbytes_s 385 return lifetime_write_kbytes_show(sbi, buf);
426 case attr_reserved_clusters: 386 case attr_reserved_clusters:
427 return sysfs_emit(buf, "%llu\n 387 return sysfs_emit(buf, "%llu\n",
428 (unsigned long 388 (unsigned long long)
429 atomic64_read( 389 atomic64_read(&sbi->s_resv_clusters));
430 case attr_sra_exceeded_retry_limit: 390 case attr_sra_exceeded_retry_limit:
431 return sysfs_emit(buf, "%llu\n 391 return sysfs_emit(buf, "%llu\n",
432 (unsigned long 392 (unsigned long long)
433 percpu_counter_sum(&sb 393 percpu_counter_sum(&sbi->s_sra_exceeded_retry_limit));
>> 394 case attr_inode_readahead:
>> 395 case attr_pointer_ui:
>> 396 if (!ptr)
>> 397 return 0;
>> 398 if (a->attr_ptr == ptr_ext4_super_block_offset)
>> 399 return sysfs_emit(buf, "%u\n",
>> 400 le32_to_cpup(ptr));
>> 401 else
>> 402 return sysfs_emit(buf, "%u\n",
>> 403 *((unsigned int *) ptr));
>> 404 case attr_pointer_ul:
>> 405 if (!ptr)
>> 406 return 0;
>> 407 return sysfs_emit(buf, "%lu\n",
>> 408 *((unsigned long *) ptr));
>> 409 case attr_pointer_u8:
>> 410 if (!ptr)
>> 411 return 0;
>> 412 return sysfs_emit(buf, "%u\n",
>> 413 *((unsigned char *) ptr));
>> 414 case attr_pointer_u64:
>> 415 if (!ptr)
>> 416 return 0;
>> 417 if (a->attr_ptr == ptr_ext4_super_block_offset)
>> 418 return sysfs_emit(buf, "%llu\n",
>> 419 le64_to_cpup(ptr));
>> 420 else
>> 421 return sysfs_emit(buf, "%llu\n",
>> 422 *((unsigned long long *) ptr));
>> 423 case attr_pointer_string:
>> 424 if (!ptr)
>> 425 return 0;
>> 426 return sysfs_emit(buf, "%.*s\n", a->attr_size,
>> 427 (char *) ptr);
>> 428 case attr_pointer_atomic:
>> 429 if (!ptr)
>> 430 return 0;
>> 431 return sysfs_emit(buf, "%d\n",
>> 432 atomic_read((atomic_t *) ptr));
434 case attr_feature: 433 case attr_feature:
435 return sysfs_emit(buf, "suppor 434 return sysfs_emit(buf, "supported\n");
436 case attr_first_error_time: 435 case attr_first_error_time:
437 return print_tstamp(buf, sbi-> 436 return print_tstamp(buf, sbi->s_es, s_first_error_time);
438 case attr_last_error_time: 437 case attr_last_error_time:
439 return print_tstamp(buf, sbi-> 438 return print_tstamp(buf, sbi->s_es, s_last_error_time);
440 case attr_journal_task: 439 case attr_journal_task:
441 return journal_task_show(sbi, 440 return journal_task_show(sbi, buf);
442 default: <<
443 return ext4_generic_attr_show( <<
444 } 441 }
>> 442
>> 443 return 0;
445 } 444 }
446 445
447 static ssize_t ext4_generic_attr_store(struct !! 446 static ssize_t ext4_attr_store(struct kobject *kobj,
448 struct !! 447 struct attribute *attr,
449 const c !! 448 const char *buf, size_t len)
450 { 449 {
451 int ret; !! 450 struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,
452 unsigned int t; !! 451 s_kobj);
453 unsigned long lt; !! 452 struct ext4_attr *a = container_of(attr, struct ext4_attr, attr);
454 void *ptr = calc_ptr(a, sbi); 453 void *ptr = calc_ptr(a, sbi);
455 !! 454 unsigned long t;
456 if (!ptr) !! 455 int ret;
457 return 0; <<
458 456
459 switch (a->attr_id) { 457 switch (a->attr_id) {
460 case attr_pointer_pi: !! 458 case attr_reserved_clusters:
461 ret = kstrtouint(skip_spaces(b !! 459 return reserved_clusters_store(sbi, buf, len);
462 if (ret) <<
463 return ret; <<
464 if ((int)t < 0) <<
465 return -EINVAL; <<
466 *((unsigned int *) ptr) = t; <<
467 return len; <<
468 case attr_pointer_ui: 460 case attr_pointer_ui:
469 ret = kstrtouint(skip_spaces(b !! 461 if (!ptr)
>> 462 return 0;
>> 463 ret = kstrtoul(skip_spaces(buf), 0, &t);
470 if (ret) 464 if (ret)
471 return ret; 465 return ret;
472 if (a->attr_ptr == ptr_ext4_su 466 if (a->attr_ptr == ptr_ext4_super_block_offset)
473 *((__le32 *) ptr) = cp 467 *((__le32 *) ptr) = cpu_to_le32(t);
474 else 468 else
475 *((unsigned int *) ptr 469 *((unsigned int *) ptr) = t;
476 return len; 470 return len;
477 case attr_mb_order: <<
478 ret = kstrtouint(skip_spaces(b <<
479 if (ret) <<
480 return ret; <<
481 if (t > 64) <<
482 return -EINVAL; <<
483 *((unsigned int *) ptr) = t; <<
484 return len; <<
485 case attr_clusters_in_group: <<
486 ret = kstrtouint(skip_spaces(b <<
487 if (ret) <<
488 return ret; <<
489 if (t > sbi->s_clusters_per_gr <<
490 return -EINVAL; <<
491 *((unsigned int *) ptr) = t; <<
492 return len; <<
493 case attr_pointer_ul: 471 case attr_pointer_ul:
494 ret = kstrtoul(skip_spaces(buf !! 472 if (!ptr)
>> 473 return 0;
>> 474 ret = kstrtoul(skip_spaces(buf), 0, &t);
495 if (ret) 475 if (ret)
496 return ret; 476 return ret;
497 *((unsigned long *) ptr) = lt; !! 477 *((unsigned long *) ptr) = t;
498 return len; 478 return len;
499 } <<
500 return 0; <<
501 } <<
502 <<
503 static ssize_t ext4_attr_store(struct kobject <<
504 struct attribut <<
505 const char *buf <<
506 { <<
507 struct ext4_sb_info *sbi = container_o <<
508 <<
509 struct ext4_attr *a = container_of(att <<
510 <<
511 switch (a->attr_id) { <<
512 case attr_reserved_clusters: <<
513 return reserved_clusters_store <<
514 case attr_inode_readahead: 479 case attr_inode_readahead:
515 return inode_readahead_blks_st 480 return inode_readahead_blks_store(sbi, buf, len);
516 case attr_trigger_test_error: 481 case attr_trigger_test_error:
517 return trigger_test_error(sbi, 482 return trigger_test_error(sbi, buf, len);
518 default: <<
519 return ext4_generic_attr_store <<
520 } 483 }
>> 484 return 0;
521 } 485 }
522 486
523 static void ext4_sb_release(struct kobject *ko 487 static void ext4_sb_release(struct kobject *kobj)
524 { 488 {
525 struct ext4_sb_info *sbi = container_o 489 struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,
526 490 s_kobj);
527 complete(&sbi->s_kobj_unregister); 491 complete(&sbi->s_kobj_unregister);
528 } 492 }
529 493
530 static void ext4_feat_release(struct kobject * 494 static void ext4_feat_release(struct kobject *kobj)
531 { 495 {
532 kfree(kobj); 496 kfree(kobj);
533 } 497 }
534 498
535 static const struct sysfs_ops ext4_attr_ops = 499 static const struct sysfs_ops ext4_attr_ops = {
536 .show = ext4_attr_show, 500 .show = ext4_attr_show,
537 .store = ext4_attr_store, 501 .store = ext4_attr_store,
538 }; 502 };
539 503
540 static const struct kobj_type ext4_sb_ktype = 504 static const struct kobj_type ext4_sb_ktype = {
541 .default_groups = ext4_groups, 505 .default_groups = ext4_groups,
542 .sysfs_ops = &ext4_attr_ops, 506 .sysfs_ops = &ext4_attr_ops,
543 .release = ext4_sb_release, 507 .release = ext4_sb_release,
544 }; 508 };
545 509
546 static const struct kobj_type ext4_feat_ktype 510 static const struct kobj_type ext4_feat_ktype = {
547 .default_groups = ext4_feat_groups, 511 .default_groups = ext4_feat_groups,
548 .sysfs_ops = &ext4_attr_ops, 512 .sysfs_ops = &ext4_attr_ops,
549 .release = ext4_feat_release, 513 .release = ext4_feat_release,
550 }; 514 };
551 515
552 void ext4_notify_error_sysfs(struct ext4_sb_in 516 void ext4_notify_error_sysfs(struct ext4_sb_info *sbi)
553 { 517 {
554 sysfs_notify(&sbi->s_kobj, NULL, "erro 518 sysfs_notify(&sbi->s_kobj, NULL, "errors_count");
555 } 519 }
556 520
557 static struct kobject *ext4_root; 521 static struct kobject *ext4_root;
558 522
559 static struct kobject *ext4_feat; 523 static struct kobject *ext4_feat;
560 524
561 int ext4_register_sysfs(struct super_block *sb 525 int ext4_register_sysfs(struct super_block *sb)
562 { 526 {
563 struct ext4_sb_info *sbi = EXT4_SB(sb) 527 struct ext4_sb_info *sbi = EXT4_SB(sb);
564 int err; 528 int err;
565 529
566 init_completion(&sbi->s_kobj_unregiste 530 init_completion(&sbi->s_kobj_unregister);
567 err = kobject_init_and_add(&sbi->s_kob 531 err = kobject_init_and_add(&sbi->s_kobj, &ext4_sb_ktype, ext4_root,
568 "%s", sb->s 532 "%s", sb->s_id);
569 if (err) { 533 if (err) {
570 kobject_put(&sbi->s_kobj); 534 kobject_put(&sbi->s_kobj);
571 wait_for_completion(&sbi->s_ko 535 wait_for_completion(&sbi->s_kobj_unregister);
572 return err; 536 return err;
573 } 537 }
574 538
575 if (ext4_proc_root) 539 if (ext4_proc_root)
576 sbi->s_proc = proc_mkdir(sb->s 540 sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root);
577 if (sbi->s_proc) { 541 if (sbi->s_proc) {
578 proc_create_single_data("optio 542 proc_create_single_data("options", S_IRUGO, sbi->s_proc,
579 ext4_seq_optio 543 ext4_seq_options_show, sb);
580 proc_create_single_data("es_sh 544 proc_create_single_data("es_shrinker_info", S_IRUGO,
581 sbi->s_proc, e 545 sbi->s_proc, ext4_seq_es_shrinker_info_show,
582 sb); 546 sb);
583 proc_create_single_data("fc_in 547 proc_create_single_data("fc_info", 0444, sbi->s_proc,
584 ext4_f 548 ext4_fc_info_show, sb);
585 proc_create_seq_data("mb_group 549 proc_create_seq_data("mb_groups", S_IRUGO, sbi->s_proc,
586 &ext4_mb_seq_g 550 &ext4_mb_seq_groups_ops, sb);
587 proc_create_single_data("mb_st 551 proc_create_single_data("mb_stats", 0444, sbi->s_proc,
588 ext4_seq_mb_st 552 ext4_seq_mb_stats_show, sb);
589 proc_create_seq_data("mb_struc 553 proc_create_seq_data("mb_structs_summary", 0444, sbi->s_proc,
590 &ext4_mb_seq_s 554 &ext4_mb_seq_structs_summary_ops, sb);
591 } 555 }
592 return 0; 556 return 0;
593 } 557 }
594 558
595 void ext4_unregister_sysfs(struct super_block 559 void ext4_unregister_sysfs(struct super_block *sb)
596 { 560 {
597 struct ext4_sb_info *sbi = EXT4_SB(sb) 561 struct ext4_sb_info *sbi = EXT4_SB(sb);
598 562
599 if (sbi->s_proc) 563 if (sbi->s_proc)
600 remove_proc_subtree(sb->s_id, 564 remove_proc_subtree(sb->s_id, ext4_proc_root);
601 kobject_del(&sbi->s_kobj); 565 kobject_del(&sbi->s_kobj);
602 } 566 }
603 567
604 int __init ext4_init_sysfs(void) 568 int __init ext4_init_sysfs(void)
605 { 569 {
606 int ret; 570 int ret;
607 571
608 ext4_root = kobject_create_and_add("ex 572 ext4_root = kobject_create_and_add("ext4", fs_kobj);
609 if (!ext4_root) 573 if (!ext4_root)
610 return -ENOMEM; 574 return -ENOMEM;
611 575
612 ext4_feat = kzalloc(sizeof(*ext4_feat) 576 ext4_feat = kzalloc(sizeof(*ext4_feat), GFP_KERNEL);
613 if (!ext4_feat) { 577 if (!ext4_feat) {
614 ret = -ENOMEM; 578 ret = -ENOMEM;
615 goto root_err; 579 goto root_err;
616 } 580 }
617 581
618 ret = kobject_init_and_add(ext4_feat, 582 ret = kobject_init_and_add(ext4_feat, &ext4_feat_ktype,
619 ext4_root, 583 ext4_root, "features");
620 if (ret) 584 if (ret)
621 goto feat_err; 585 goto feat_err;
622 586
623 ext4_proc_root = proc_mkdir(proc_dirna 587 ext4_proc_root = proc_mkdir(proc_dirname, NULL);
624 return ret; 588 return ret;
625 589
626 feat_err: 590 feat_err:
627 kobject_put(ext4_feat); 591 kobject_put(ext4_feat);
628 ext4_feat = NULL; 592 ext4_feat = NULL;
629 root_err: 593 root_err:
630 kobject_put(ext4_root); 594 kobject_put(ext4_root);
631 ext4_root = NULL; 595 ext4_root = NULL;
632 return ret; 596 return ret;
633 } 597 }
634 598
635 void ext4_exit_sysfs(void) 599 void ext4_exit_sysfs(void)
636 { 600 {
637 kobject_put(ext4_feat); 601 kobject_put(ext4_feat);
638 ext4_feat = NULL; 602 ext4_feat = NULL;
639 kobject_put(ext4_root); 603 kobject_put(ext4_root);
640 ext4_root = NULL; 604 ext4_root = NULL;
641 remove_proc_entry(proc_dirname, NULL); 605 remove_proc_entry(proc_dirname, NULL);
642 ext4_proc_root = NULL; 606 ext4_proc_root = NULL;
643 } 607 }
644 608
645 609
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.