add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/fs/nilfs2/dat.c
..
..
@@ -111,6 +111,13 @@
111
111
 	kunmap_atomic(kaddr);
112
112
 
113
113
 	nilfs_dat_commit_entry(dat, req);
114
+
115
+	if (unlikely(req->pr_desc_bh == NULL || req->pr_bitmap_bh == NULL)) {
116
+		nilfs_error(dat->i_sb,
117
+			    "state inconsistency probably due to duplicate use of vblocknr = %llu",
118
+			    (unsigned long long)req->pr_entry_nr);
119
+		return;
120
+	}
114
121
 	nilfs_palloc_commit_free_entry(dat, req);
115
122
 }
116
123
 
..
..
@@ -340,11 +347,11 @@
340
347
 	kaddr = kmap_atomic(entry_bh->b_page);
341
348
 	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);
342
349
 	if (unlikely(entry->de_blocknr == cpu_to_le64(0))) {
343
-		nilfs_msg(dat->i_sb, KERN_CRIT,
344
-			  "%s: invalid vblocknr = %llu, [%llu, %llu)",
345
-			  __func__, (unsigned long long)vblocknr,
346
-			  (unsigned long long)le64_to_cpu(entry->de_start),
347
-			  (unsigned long long)le64_to_cpu(entry->de_end));
350
+		nilfs_crit(dat->i_sb,
351
+			   "%s: invalid vblocknr = %llu, [%llu, %llu)",
352
+			   __func__, (unsigned long long)vblocknr,
353
+			   (unsigned long long)le64_to_cpu(entry->de_start),
354
+			   (unsigned long long)le64_to_cpu(entry->de_end));
348
355
 		kunmap_atomic(kaddr);
349
356
 		brelse(entry_bh);
350
357
 		return -EINVAL;
..
..
@@ -471,11 +478,11 @@
471
478
 	int err;
472
479
 
473
480
 	if (entry_size > sb->s_blocksize) {
474
-		nilfs_msg(sb, KERN_ERR, "too large DAT entry size: %zu bytes",
481
+		nilfs_err(sb, "too large DAT entry size: %zu bytes",
475
482
 			  entry_size);
476
483
 		return -EINVAL;
477
484
 	} else if (entry_size < NILFS_MIN_DAT_ENTRY_SIZE) {
478
-		nilfs_msg(sb, KERN_ERR, "too small DAT entry size: %zu bytes",
485
+		nilfs_err(sb, "too small DAT entry size: %zu bytes",
479
486
 			  entry_size);
480
487
 		return -EINVAL;
481
488
 	}
..
..
@@ -497,7 +504,9 @@
497
504
 	di = NILFS_DAT_I(dat);
498
505
 	lockdep_set_class(&di->mi.mi_sem, &dat_lock_key);
499
506
 	nilfs_palloc_setup_cache(dat, &di->palloc_cache);
500
-	nilfs_mdt_setup_shadow_map(dat, &di->shadow);
507
+	err = nilfs_mdt_setup_shadow_map(dat, &di->shadow);
508
+	if (err)
509
+		goto failed;
501
510
 
502
511
 	err = nilfs_read_inode_common(dat, raw_inode);
503
512
 	if (err)