1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * Persistent Storage - ramfs parts. 3 * Persistent Storage - ramfs parts.
4 * 4 *
5 * Copyright (C) 2010 Intel Corporation <tony. 5 * Copyright (C) 2010 Intel Corporation <tony.luck@intel.com>
6 */ 6 */
7 7
8 #include <linux/module.h> 8 #include <linux/module.h>
9 #include <linux/fs.h> 9 #include <linux/fs.h>
10 #include <linux/fsnotify.h> 10 #include <linux/fsnotify.h>
11 #include <linux/pagemap.h> 11 #include <linux/pagemap.h>
12 #include <linux/highmem.h> 12 #include <linux/highmem.h>
13 #include <linux/time.h> 13 #include <linux/time.h>
14 #include <linux/init.h> 14 #include <linux/init.h>
15 #include <linux/list.h> 15 #include <linux/list.h>
16 #include <linux/string.h> 16 #include <linux/string.h>
17 #include <linux/mount.h> 17 #include <linux/mount.h>
18 #include <linux/seq_file.h> 18 #include <linux/seq_file.h>
19 #include <linux/ramfs.h> 19 #include <linux/ramfs.h>
20 #include <linux/parser.h> 20 #include <linux/parser.h>
21 #include <linux/sched.h> 21 #include <linux/sched.h>
22 #include <linux/magic.h> 22 #include <linux/magic.h>
23 #include <linux/pstore.h> 23 #include <linux/pstore.h>
24 #include <linux/slab.h> 24 #include <linux/slab.h>
25 #include <linux/uaccess.h> 25 #include <linux/uaccess.h>
26 #include <linux/cleanup.h> <<
27 26
28 #include "internal.h" 27 #include "internal.h"
29 28
30 #define PSTORE_NAMELEN 64 29 #define PSTORE_NAMELEN 64
31 30
32 static DEFINE_MUTEX(records_list_lock); 31 static DEFINE_MUTEX(records_list_lock);
33 static LIST_HEAD(records_list); 32 static LIST_HEAD(records_list);
34 33
35 static DEFINE_MUTEX(pstore_sb_lock); 34 static DEFINE_MUTEX(pstore_sb_lock);
36 static struct super_block *pstore_sb; 35 static struct super_block *pstore_sb;
37 36
38 DEFINE_FREE(pstore_iput, struct inode *, if (_ <<
39 <<
40 struct pstore_private { 37 struct pstore_private {
41 struct list_head list; 38 struct list_head list;
42 struct dentry *dentry; 39 struct dentry *dentry;
43 struct pstore_record *record; 40 struct pstore_record *record;
44 size_t total_size; 41 size_t total_size;
45 }; 42 };
46 43
47 struct pstore_ftrace_seq_data { 44 struct pstore_ftrace_seq_data {
48 const void *ptr; 45 const void *ptr;
49 size_t off; 46 size_t off;
50 size_t size; 47 size_t size;
51 }; 48 };
52 49
53 #define REC_SIZE sizeof(struct pstore_ftrace_r 50 #define REC_SIZE sizeof(struct pstore_ftrace_record)
54 51
55 static void free_pstore_private(struct pstore_ 52 static void free_pstore_private(struct pstore_private *private)
56 { 53 {
57 if (!private) 54 if (!private)
58 return; 55 return;
59 if (private->record) { 56 if (private->record) {
60 kvfree(private->record->buf); !! 57 kfree(private->record->buf);
61 kfree(private->record->priv); <<
62 kfree(private->record); 58 kfree(private->record);
63 } 59 }
64 kfree(private); 60 kfree(private);
65 } 61 }
66 DEFINE_FREE(pstore_private, struct pstore_priv <<
67 62
68 static void *pstore_ftrace_seq_start(struct se 63 static void *pstore_ftrace_seq_start(struct seq_file *s, loff_t *pos)
69 { 64 {
70 struct pstore_private *ps = s->private 65 struct pstore_private *ps = s->private;
71 struct pstore_ftrace_seq_data *data __ !! 66 struct pstore_ftrace_seq_data *data;
72 67
73 data = kzalloc(sizeof(*data), GFP_KERN 68 data = kzalloc(sizeof(*data), GFP_KERNEL);
74 if (!data) 69 if (!data)
75 return NULL; 70 return NULL;
76 71
77 data->off = ps->total_size % REC_SIZE; 72 data->off = ps->total_size % REC_SIZE;
78 data->off += *pos * REC_SIZE; 73 data->off += *pos * REC_SIZE;
79 if (data->off + REC_SIZE > ps->total_s !! 74 if (data->off + REC_SIZE > ps->total_size) {
>> 75 kfree(data);
80 return NULL; 76 return NULL;
>> 77 }
>> 78
>> 79 return data;
81 80
82 return_ptr(data); <<
83 } 81 }
84 82
85 static void pstore_ftrace_seq_stop(struct seq_ 83 static void pstore_ftrace_seq_stop(struct seq_file *s, void *v)
86 { 84 {
87 kfree(v); 85 kfree(v);
88 } 86 }
89 87
90 static void *pstore_ftrace_seq_next(struct seq 88 static void *pstore_ftrace_seq_next(struct seq_file *s, void *v, loff_t *pos)
91 { 89 {
92 struct pstore_private *ps = s->private 90 struct pstore_private *ps = s->private;
93 struct pstore_ftrace_seq_data *data = 91 struct pstore_ftrace_seq_data *data = v;
94 92
95 (*pos)++; 93 (*pos)++;
96 data->off += REC_SIZE; 94 data->off += REC_SIZE;
97 if (data->off + REC_SIZE > ps->total_s 95 if (data->off + REC_SIZE > ps->total_size)
98 return NULL; 96 return NULL;
99 97
100 return data; 98 return data;
101 } 99 }
102 100
103 static int pstore_ftrace_seq_show(struct seq_f 101 static int pstore_ftrace_seq_show(struct seq_file *s, void *v)
104 { 102 {
105 struct pstore_private *ps = s->private 103 struct pstore_private *ps = s->private;
106 struct pstore_ftrace_seq_data *data = 104 struct pstore_ftrace_seq_data *data = v;
107 struct pstore_ftrace_record *rec; 105 struct pstore_ftrace_record *rec;
108 106
109 if (!data) 107 if (!data)
110 return 0; 108 return 0;
111 109
112 rec = (struct pstore_ftrace_record *)( 110 rec = (struct pstore_ftrace_record *)(ps->record->buf + data->off);
113 111
114 seq_printf(s, "CPU:%d ts:%llu %08lx % 112 seq_printf(s, "CPU:%d ts:%llu %08lx %08lx %ps <- %pS\n",
115 pstore_ftrace_decode_cpu(re 113 pstore_ftrace_decode_cpu(rec),
116 pstore_ftrace_read_timestam 114 pstore_ftrace_read_timestamp(rec),
117 rec->ip, rec->parent_ip, (v 115 rec->ip, rec->parent_ip, (void *)rec->ip,
118 (void *)rec->parent_ip); 116 (void *)rec->parent_ip);
119 117
120 return 0; 118 return 0;
121 } 119 }
122 120
123 static const struct seq_operations pstore_ftra 121 static const struct seq_operations pstore_ftrace_seq_ops = {
124 .start = pstore_ftrace_seq_start, 122 .start = pstore_ftrace_seq_start,
125 .next = pstore_ftrace_seq_next, 123 .next = pstore_ftrace_seq_next,
126 .stop = pstore_ftrace_seq_stop, 124 .stop = pstore_ftrace_seq_stop,
127 .show = pstore_ftrace_seq_show, 125 .show = pstore_ftrace_seq_show,
128 }; 126 };
129 127
130 static ssize_t pstore_file_read(struct file *f 128 static ssize_t pstore_file_read(struct file *file, char __user *userbuf,
131 129 size_t count, loff_t *ppos)
132 { 130 {
133 struct seq_file *sf = file->private_da 131 struct seq_file *sf = file->private_data;
134 struct pstore_private *ps = sf->privat 132 struct pstore_private *ps = sf->private;
135 133
136 if (ps->record->type == PSTORE_TYPE_FT 134 if (ps->record->type == PSTORE_TYPE_FTRACE)
137 return seq_read(file, userbuf, 135 return seq_read(file, userbuf, count, ppos);
138 return simple_read_from_buffer(userbuf 136 return simple_read_from_buffer(userbuf, count, ppos,
139 ps->rec 137 ps->record->buf, ps->total_size);
140 } 138 }
141 139
142 static int pstore_file_open(struct inode *inod 140 static int pstore_file_open(struct inode *inode, struct file *file)
143 { 141 {
144 struct pstore_private *ps = inode->i_p 142 struct pstore_private *ps = inode->i_private;
145 struct seq_file *sf; 143 struct seq_file *sf;
146 int err; 144 int err;
147 const struct seq_operations *sops = NU 145 const struct seq_operations *sops = NULL;
148 146
149 if (ps->record->type == PSTORE_TYPE_FT 147 if (ps->record->type == PSTORE_TYPE_FTRACE)
150 sops = &pstore_ftrace_seq_ops; 148 sops = &pstore_ftrace_seq_ops;
151 149
152 err = seq_open(file, sops); 150 err = seq_open(file, sops);
153 if (err < 0) 151 if (err < 0)
154 return err; 152 return err;
155 153
156 sf = file->private_data; 154 sf = file->private_data;
157 sf->private = ps; 155 sf->private = ps;
158 156
159 return 0; 157 return 0;
160 } 158 }
161 159
162 static loff_t pstore_file_llseek(struct file * 160 static loff_t pstore_file_llseek(struct file *file, loff_t off, int whence)
163 { 161 {
164 struct seq_file *sf = file->private_da 162 struct seq_file *sf = file->private_data;
165 163
166 if (sf->op) 164 if (sf->op)
167 return seq_lseek(file, off, wh 165 return seq_lseek(file, off, whence);
168 return default_llseek(file, off, whenc 166 return default_llseek(file, off, whence);
169 } 167 }
170 168
171 static const struct file_operations pstore_fil 169 static const struct file_operations pstore_file_operations = {
172 .open = pstore_file_open, 170 .open = pstore_file_open,
173 .read = pstore_file_read, 171 .read = pstore_file_read,
174 .llseek = pstore_file_llseek, 172 .llseek = pstore_file_llseek,
175 .release = seq_release, 173 .release = seq_release,
176 }; 174 };
177 175
178 /* 176 /*
179 * When a file is unlinked from our file syste 177 * When a file is unlinked from our file system we call the
180 * platform driver to erase the record from pe 178 * platform driver to erase the record from persistent store.
181 */ 179 */
182 static int pstore_unlink(struct inode *dir, st 180 static int pstore_unlink(struct inode *dir, struct dentry *dentry)
183 { 181 {
184 struct pstore_private *p = d_inode(den 182 struct pstore_private *p = d_inode(dentry)->i_private;
185 struct pstore_record *record = p->reco 183 struct pstore_record *record = p->record;
>> 184 int rc = 0;
186 185
187 if (!record->psi->erase) 186 if (!record->psi->erase)
188 return -EPERM; 187 return -EPERM;
189 188
190 /* Make sure we can't race while remov 189 /* Make sure we can't race while removing this file. */
191 scoped_guard(mutex, &records_list_lock !! 190 mutex_lock(&records_list_lock);
192 if (!list_empty(&p->list)) !! 191 if (!list_empty(&p->list))
193 list_del_init(&p->list !! 192 list_del_init(&p->list);
194 else !! 193 else
195 return -ENOENT; !! 194 rc = -ENOENT;
196 p->dentry = NULL; !! 195 p->dentry = NULL;
197 } !! 196 mutex_unlock(&records_list_lock);
198 !! 197 if (rc)
199 scoped_guard(mutex, &record->psi->read !! 198 return rc;
200 record->psi->erase(record); !! 199
>> 200 mutex_lock(&record->psi->read_mutex);
>> 201 record->psi->erase(record);
>> 202 mutex_unlock(&record->psi->read_mutex);
201 203
202 return simple_unlink(dir, dentry); 204 return simple_unlink(dir, dentry);
203 } 205 }
204 206
205 static void pstore_evict_inode(struct inode *i 207 static void pstore_evict_inode(struct inode *inode)
206 { 208 {
207 struct pstore_private *p = inode->i_ 209 struct pstore_private *p = inode->i_private;
208 210
209 clear_inode(inode); 211 clear_inode(inode);
210 free_pstore_private(p); 212 free_pstore_private(p);
211 } 213 }
212 214
213 static const struct inode_operations pstore_di 215 static const struct inode_operations pstore_dir_inode_operations = {
214 .lookup = simple_lookup, 216 .lookup = simple_lookup,
215 .unlink = pstore_unlink, 217 .unlink = pstore_unlink,
216 }; 218 };
217 219
218 static struct inode *pstore_get_inode(struct s 220 static struct inode *pstore_get_inode(struct super_block *sb)
219 { 221 {
220 struct inode *inode = new_inode(sb); 222 struct inode *inode = new_inode(sb);
221 if (inode) { 223 if (inode) {
222 inode->i_ino = get_next_ino(); 224 inode->i_ino = get_next_ino();
223 simple_inode_init_ts(inode); !! 225 inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
224 } 226 }
225 return inode; 227 return inode;
226 } 228 }
227 229
228 enum { 230 enum {
229 Opt_kmsg_bytes, Opt_err 231 Opt_kmsg_bytes, Opt_err
230 }; 232 };
231 233
232 static const match_table_t tokens = { 234 static const match_table_t tokens = {
233 {Opt_kmsg_bytes, "kmsg_bytes=%u"}, 235 {Opt_kmsg_bytes, "kmsg_bytes=%u"},
234 {Opt_err, NULL} 236 {Opt_err, NULL}
235 }; 237 };
236 238
237 static void parse_options(char *options) 239 static void parse_options(char *options)
238 { 240 {
239 char *p; 241 char *p;
240 substring_t args[MAX_OPT_ARGS]; 242 substring_t args[MAX_OPT_ARGS];
241 int option; 243 int option;
242 244
243 if (!options) 245 if (!options)
244 return; 246 return;
245 247
246 while ((p = strsep(&options, ",")) != 248 while ((p = strsep(&options, ",")) != NULL) {
247 int token; 249 int token;
248 250
249 if (!*p) 251 if (!*p)
250 continue; 252 continue;
251 253
252 token = match_token(p, tokens, 254 token = match_token(p, tokens, args);
253 switch (token) { 255 switch (token) {
254 case Opt_kmsg_bytes: 256 case Opt_kmsg_bytes:
255 if (!match_int(&args[0 257 if (!match_int(&args[0], &option))
256 pstore_set_kms 258 pstore_set_kmsg_bytes(option);
257 break; 259 break;
258 } 260 }
259 } 261 }
260 } 262 }
261 263
262 /* 264 /*
263 * Display the mount options in /proc/mounts. 265 * Display the mount options in /proc/mounts.
264 */ 266 */
265 static int pstore_show_options(struct seq_file 267 static int pstore_show_options(struct seq_file *m, struct dentry *root)
266 { 268 {
267 if (kmsg_bytes != CONFIG_PSTORE_DEFAUL !! 269 if (kmsg_bytes != PSTORE_DEFAULT_KMSG_BYTES)
268 seq_printf(m, ",kmsg_bytes=%lu 270 seq_printf(m, ",kmsg_bytes=%lu", kmsg_bytes);
269 return 0; 271 return 0;
270 } 272 }
271 273
272 static int pstore_remount(struct super_block * 274 static int pstore_remount(struct super_block *sb, int *flags, char *data)
273 { 275 {
274 sync_filesystem(sb); 276 sync_filesystem(sb);
275 parse_options(data); 277 parse_options(data);
276 278
277 return 0; 279 return 0;
278 } 280 }
279 281
280 static const struct super_operations pstore_op 282 static const struct super_operations pstore_ops = {
281 .statfs = simple_statfs, 283 .statfs = simple_statfs,
282 .drop_inode = generic_delete_inode 284 .drop_inode = generic_delete_inode,
283 .evict_inode = pstore_evict_inode, 285 .evict_inode = pstore_evict_inode,
284 .remount_fs = pstore_remount, 286 .remount_fs = pstore_remount,
285 .show_options = pstore_show_options, 287 .show_options = pstore_show_options,
286 }; 288 };
287 289
288 static struct dentry *psinfo_lock_root(void) 290 static struct dentry *psinfo_lock_root(void)
289 { 291 {
290 struct dentry *root; 292 struct dentry *root;
291 293
292 guard(mutex)(&pstore_sb_lock); !! 294 mutex_lock(&pstore_sb_lock);
293 /* 295 /*
294 * Having no backend is fine -- no rec 296 * Having no backend is fine -- no records appear.
295 * Not being mounted is fine -- nothin 297 * Not being mounted is fine -- nothing to do.
296 */ 298 */
297 if (!psinfo || !pstore_sb) !! 299 if (!psinfo || !pstore_sb) {
>> 300 mutex_unlock(&pstore_sb_lock);
298 return NULL; 301 return NULL;
>> 302 }
299 303
300 root = pstore_sb->s_root; 304 root = pstore_sb->s_root;
301 inode_lock(d_inode(root)); 305 inode_lock(d_inode(root));
>> 306 mutex_unlock(&pstore_sb_lock);
302 307
303 return root; 308 return root;
304 } 309 }
305 310
306 int pstore_put_backend_records(struct pstore_i 311 int pstore_put_backend_records(struct pstore_info *psi)
307 { 312 {
308 struct pstore_private *pos, *tmp; 313 struct pstore_private *pos, *tmp;
309 struct dentry *root; 314 struct dentry *root;
>> 315 int rc = 0;
310 316
311 root = psinfo_lock_root(); 317 root = psinfo_lock_root();
312 if (!root) 318 if (!root)
313 return 0; 319 return 0;
314 320
315 scoped_guard(mutex, &records_list_lock !! 321 mutex_lock(&records_list_lock);
316 list_for_each_entry_safe(pos, !! 322 list_for_each_entry_safe(pos, tmp, &records_list, list) {
317 if (pos->record->psi = !! 323 if (pos->record->psi == psi) {
318 list_del_init( !! 324 list_del_init(&pos->list);
319 d_invalidate(p !! 325 rc = simple_unlink(d_inode(root), pos->dentry);
320 simple_unlink( !! 326 if (WARN_ON(rc))
321 pos->dentry = !! 327 break;
322 } !! 328 d_drop(pos->dentry);
>> 329 dput(pos->dentry);
>> 330 pos->dentry = NULL;
323 } 331 }
324 } 332 }
>> 333 mutex_unlock(&records_list_lock);
325 334
326 inode_unlock(d_inode(root)); 335 inode_unlock(d_inode(root));
327 336
328 return 0; !! 337 return rc;
329 } 338 }
330 339
331 /* 340 /*
332 * Make a regular file in the root directory o 341 * Make a regular file in the root directory of our file system.
333 * Load it up with "size" bytes of data from " 342 * Load it up with "size" bytes of data from "buf".
334 * Set the mtime & ctime to the date that this 343 * Set the mtime & ctime to the date that this record was originally stored.
335 */ 344 */
336 int pstore_mkfile(struct dentry *root, struct 345 int pstore_mkfile(struct dentry *root, struct pstore_record *record)
337 { 346 {
338 struct dentry *dentry; 347 struct dentry *dentry;
339 struct inode *inode __free( !! 348 struct inode *inode;
>> 349 int rc = 0;
340 char name[PSTORE_NA 350 char name[PSTORE_NAMELEN];
341 struct pstore_private *private __fre !! 351 struct pstore_private *private, *pos;
342 size_t size = record- 352 size_t size = record->size + record->ecc_notice_size;
343 353
344 if (WARN_ON(!inode_is_locked(d_inode(r 354 if (WARN_ON(!inode_is_locked(d_inode(root))))
345 return -EINVAL; 355 return -EINVAL;
346 356
347 guard(mutex)(&records_list_lock); !! 357 rc = -EEXIST;
348 <<
349 /* Skip records that are already prese 358 /* Skip records that are already present in the filesystem. */
>> 359 mutex_lock(&records_list_lock);
350 list_for_each_entry(pos, &records_list 360 list_for_each_entry(pos, &records_list, list) {
351 if (pos->record->type == recor 361 if (pos->record->type == record->type &&
352 pos->record->id == record- 362 pos->record->id == record->id &&
353 pos->record->psi == record 363 pos->record->psi == record->psi)
354 return -EEXIST; !! 364 goto fail;
355 } 365 }
356 366
>> 367 rc = -ENOMEM;
357 inode = pstore_get_inode(root->d_sb); 368 inode = pstore_get_inode(root->d_sb);
358 if (!inode) 369 if (!inode)
359 return -ENOMEM; !! 370 goto fail;
360 inode->i_mode = S_IFREG | 0444; 371 inode->i_mode = S_IFREG | 0444;
361 inode->i_fop = &pstore_file_operations 372 inode->i_fop = &pstore_file_operations;
362 scnprintf(name, sizeof(name), "%s-%s-% 373 scnprintf(name, sizeof(name), "%s-%s-%llu%s",
363 pstore_type_to_name(re 374 pstore_type_to_name(record->type),
364 record->psi->name, rec 375 record->psi->name, record->id,
365 record->compressed ? " 376 record->compressed ? ".enc.z" : "");
366 377
367 private = kzalloc(sizeof(*private), GF 378 private = kzalloc(sizeof(*private), GFP_KERNEL);
368 if (!private) 379 if (!private)
369 return -ENOMEM; !! 380 goto fail_inode;
370 381
371 dentry = d_alloc_name(root, name); 382 dentry = d_alloc_name(root, name);
372 if (!dentry) 383 if (!dentry)
373 return -ENOMEM; !! 384 goto fail_private;
374 385
375 private->dentry = dentry; 386 private->dentry = dentry;
376 private->record = record; 387 private->record = record;
377 inode->i_size = private->total_size = 388 inode->i_size = private->total_size = size;
378 inode->i_private = private; 389 inode->i_private = private;
379 390
380 if (record->time.tv_sec) 391 if (record->time.tv_sec)
381 inode_set_mtime_to_ts(inode, !! 392 inode->i_mtime = inode->i_ctime = record->time;
382 inode_se <<
383 393
384 d_add(dentry, no_free_ptr(inode)); !! 394 d_add(dentry, inode);
385 395
386 list_add(&(no_free_ptr(private))->list !! 396 list_add(&private->list, &records_list);
>> 397 mutex_unlock(&records_list_lock);
387 398
388 return 0; 399 return 0;
>> 400
>> 401 fail_private:
>> 402 free_pstore_private(private);
>> 403 fail_inode:
>> 404 iput(inode);
>> 405 fail:
>> 406 mutex_unlock(&records_list_lock);
>> 407 return rc;
389 } 408 }
390 409
391 /* 410 /*
392 * Read all the records from the persistent st 411 * Read all the records from the persistent store. Create
393 * files in our filesystem. Don't warn about 412 * files in our filesystem. Don't warn about -EEXIST errors
394 * when we are re-scanning the backing store l 413 * when we are re-scanning the backing store looking to add new
395 * error records. 414 * error records.
396 */ 415 */
397 void pstore_get_records(int quiet) 416 void pstore_get_records(int quiet)
398 { 417 {
399 struct dentry *root; 418 struct dentry *root;
400 419
401 root = psinfo_lock_root(); 420 root = psinfo_lock_root();
402 if (!root) 421 if (!root)
403 return; 422 return;
404 423
405 pstore_get_backend_records(psinfo, roo 424 pstore_get_backend_records(psinfo, root, quiet);
406 inode_unlock(d_inode(root)); 425 inode_unlock(d_inode(root));
407 } 426 }
408 427
409 static int pstore_fill_super(struct super_bloc 428 static int pstore_fill_super(struct super_block *sb, void *data, int silent)
410 { 429 {
411 struct inode *inode; 430 struct inode *inode;
412 431
413 sb->s_maxbytes = MAX_LFS_FILE 432 sb->s_maxbytes = MAX_LFS_FILESIZE;
414 sb->s_blocksize = PAGE_SIZE; 433 sb->s_blocksize = PAGE_SIZE;
415 sb->s_blocksize_bits = PAGE_SHIFT; 434 sb->s_blocksize_bits = PAGE_SHIFT;
416 sb->s_magic = PSTOREFS_MAG 435 sb->s_magic = PSTOREFS_MAGIC;
417 sb->s_op = &pstore_ops; 436 sb->s_op = &pstore_ops;
418 sb->s_time_gran = 1; 437 sb->s_time_gran = 1;
419 438
420 parse_options(data); 439 parse_options(data);
421 440
422 inode = pstore_get_inode(sb); 441 inode = pstore_get_inode(sb);
423 if (inode) { 442 if (inode) {
424 inode->i_mode = S_IFDIR | 0750 443 inode->i_mode = S_IFDIR | 0750;
425 inode->i_op = &pstore_dir_inod 444 inode->i_op = &pstore_dir_inode_operations;
426 inode->i_fop = &simple_dir_ope 445 inode->i_fop = &simple_dir_operations;
427 inc_nlink(inode); 446 inc_nlink(inode);
428 } 447 }
429 sb->s_root = d_make_root(inode); 448 sb->s_root = d_make_root(inode);
430 if (!sb->s_root) 449 if (!sb->s_root)
431 return -ENOMEM; 450 return -ENOMEM;
432 451
433 scoped_guard(mutex, &pstore_sb_lock) !! 452 mutex_lock(&pstore_sb_lock);
434 pstore_sb = sb; !! 453 pstore_sb = sb;
>> 454 mutex_unlock(&pstore_sb_lock);
435 455
436 pstore_get_records(0); 456 pstore_get_records(0);
437 457
438 return 0; 458 return 0;
439 } 459 }
440 460
441 static struct dentry *pstore_mount(struct file 461 static struct dentry *pstore_mount(struct file_system_type *fs_type,
442 int flags, const char *dev_name, void 462 int flags, const char *dev_name, void *data)
443 { 463 {
444 return mount_single(fs_type, flags, da 464 return mount_single(fs_type, flags, data, pstore_fill_super);
445 } 465 }
446 466
447 static void pstore_kill_sb(struct super_block 467 static void pstore_kill_sb(struct super_block *sb)
448 { 468 {
449 guard(mutex)(&pstore_sb_lock); !! 469 mutex_lock(&pstore_sb_lock);
450 WARN_ON(pstore_sb && pstore_sb != sb); !! 470 WARN_ON(pstore_sb != sb);
451 471
452 kill_litter_super(sb); 472 kill_litter_super(sb);
453 pstore_sb = NULL; 473 pstore_sb = NULL;
454 474
455 guard(mutex)(&records_list_lock); !! 475 mutex_lock(&records_list_lock);
456 INIT_LIST_HEAD(&records_list); 476 INIT_LIST_HEAD(&records_list);
>> 477 mutex_unlock(&records_list_lock);
>> 478
>> 479 mutex_unlock(&pstore_sb_lock);
457 } 480 }
458 481
459 static struct file_system_type pstore_fs_type 482 static struct file_system_type pstore_fs_type = {
460 .owner = THIS_MODULE, 483 .owner = THIS_MODULE,
461 .name = "pstore", 484 .name = "pstore",
462 .mount = pstore_mount, 485 .mount = pstore_mount,
463 .kill_sb = pstore_kill_sb, 486 .kill_sb = pstore_kill_sb,
464 }; 487 };
465 488
466 int __init pstore_init_fs(void) 489 int __init pstore_init_fs(void)
467 { 490 {
468 int err; 491 int err;
469 492
470 /* Create a convenient mount point for 493 /* Create a convenient mount point for people to access pstore */
471 err = sysfs_create_mount_point(fs_kobj 494 err = sysfs_create_mount_point(fs_kobj, "pstore");
472 if (err) 495 if (err)
473 goto out; 496 goto out;
474 497
475 err = register_filesystem(&pstore_fs_t 498 err = register_filesystem(&pstore_fs_type);
476 if (err < 0) 499 if (err < 0)
477 sysfs_remove_mount_point(fs_ko 500 sysfs_remove_mount_point(fs_kobj, "pstore");
478 501
479 out: 502 out:
480 return err; 503 return err;
481 } 504 }
482 505
483 void __exit pstore_exit_fs(void) 506 void __exit pstore_exit_fs(void)
484 { 507 {
485 unregister_filesystem(&pstore_fs_type) 508 unregister_filesystem(&pstore_fs_type);
486 sysfs_remove_mount_point(fs_kobj, "pst 509 sysfs_remove_mount_point(fs_kobj, "pstore");
487 } 510 }
488 511
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.