export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/fs/nilfs2/sysfs.c
..
..
@@ -261,8 +261,8 @@
261
261
 	err = nilfs_cpfile_get_stat(nilfs->ns_cpfile, &cpstat);
262
262
 	up_read(&nilfs->ns_segctor_sem);
263
263
 	if (err < 0) {
264
-		nilfs_msg(nilfs->ns_sb, KERN_ERR,
265
-			  "unable to get checkpoint stat: err=%d", err);
264
+		nilfs_err(nilfs->ns_sb, "unable to get checkpoint stat: err=%d",
265
+			  err);
266
266
 		return err;
267
267
 	}
268
268
 
..
..
@@ -284,8 +284,8 @@
284
284
 	err = nilfs_cpfile_get_stat(nilfs->ns_cpfile, &cpstat);
285
285
 	up_read(&nilfs->ns_segctor_sem);
286
286
 	if (err < 0) {
287
-		nilfs_msg(nilfs->ns_sb, KERN_ERR,
288
-			  "unable to get checkpoint stat: err=%d", err);
287
+		nilfs_err(nilfs->ns_sb, "unable to get checkpoint stat: err=%d",
288
+			  err);
289
289
 		return err;
290
290
 	}
291
291
 
..
..
@@ -403,8 +403,8 @@
403
403
 	err = nilfs_sufile_get_stat(nilfs->ns_sufile, &sustat);
404
404
 	up_read(&nilfs->ns_segctor_sem);
405
405
 	if (err < 0) {
406
-		nilfs_msg(nilfs->ns_sb, KERN_ERR,
407
-			  "unable to get segment stat: err=%d", err);
406
+		nilfs_err(nilfs->ns_sb, "unable to get segment stat: err=%d",
407
+			  err);
408
408
 		return err;
409
409
 	}
410
410
 
..
..
@@ -777,15 +777,15 @@
777
777
 
778
778
 	err = kstrtouint(skip_spaces(buf), 0, &val);
779
779
 	if (err) {
780
-		nilfs_msg(nilfs->ns_sb, KERN_ERR,
781
-			  "unable to convert string: err=%d", err);
780
+		nilfs_err(nilfs->ns_sb, "unable to convert string: err=%d",
781
+			  err);
782
782
 		return err;
783
783
 	}
784
784
 
785
785
 	if (val < NILFS_SB_FREQ) {
786
786
 		val = NILFS_SB_FREQ;
787
-		nilfs_msg(nilfs->ns_sb, KERN_WARNING,
788
-			  "superblock update frequency cannot be lesser than 10 seconds");
787
+		nilfs_warn(nilfs->ns_sb,
788
+			   "superblock update frequency cannot be lesser than 10 seconds");
789
789
 	}
790
790
 
791
791
 	down_write(&nilfs->ns_sem);
..
..
@@ -988,8 +988,7 @@
988
988
 	nilfs->ns_dev_subgroups = kzalloc(devgrp_size, GFP_KERNEL);
989
989
 	if (unlikely(!nilfs->ns_dev_subgroups)) {
990
990
 		err = -ENOMEM;
991
-		nilfs_msg(sb, KERN_ERR,
992
-			  "unable to allocate memory for device group");
991
+		nilfs_err(sb, "unable to allocate memory for device group");
993
992
 		goto failed_create_device_group;
994
993
 	}
995
994
 
..
..
@@ -1098,15 +1097,13 @@
1098
1097
 	nilfs_kset = kset_create_and_add(NILFS_ROOT_GROUP_NAME, NULL, fs_kobj);
1099
1098
 	if (!nilfs_kset) {
1100
1099
 		err = -ENOMEM;
1101
-		nilfs_msg(NULL, KERN_ERR,
1102
-			  "unable to create sysfs entry: err=%d", err);
1100
+		nilfs_err(NULL, "unable to create sysfs entry: err=%d", err);
1103
1101
 		goto failed_sysfs_init;
1104
1102
 	}
1105
1103
 
1106
1104
 	err = sysfs_create_group(&nilfs_kset->kobj, &nilfs_feature_attr_group);
1107
1105
 	if (unlikely(err)) {
1108
-		nilfs_msg(NULL, KERN_ERR,
1109
-			  "unable to create feature group: err=%d", err);
1106
+		nilfs_err(NULL, "unable to create feature group: err=%d", err);
1110
1107
 		goto cleanup_sysfs_init;
1111
1108
 	}
1112
1109