ubifs: Fix WARN_ON logic in exit path

richardweinberger · gregkh · commit f8ccb14fd6c9 · 2018-10-13T11:05:02.000+02:00
ubifs_assert() is not WARN_ON(), so we have to invert the checks. Randy faced this warning with UBIFS being a module, since most users use UBIFS as builtin because UBIFS is the rootfs nobody noticed so far. :-( Including me. Reported-by: Randy Dunlap <rdunlap@infradead.org> Fixes: 54169dd ("ubifs: Turn two ubifs_assert() into a WARN_ON()") Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
@@ -2337,8 +2337,8 @@ late_initcall(ubifs_init);
 
 static void __exit ubifs_exit(void)
 {
-	WARN_ON(list_empty(&ubifs_infos));
-	WARN_ON(atomic_long_read(&ubifs_clean_zn_cnt) == 0);
+	WARN_ON(!list_empty(&ubifs_infos));
+	WARN_ON(atomic_long_read(&ubifs_clean_zn_cnt) != 0);
 
 	dbg_debugfs_exit();
 	ubifs_compressors_exit();

Original file line number	Diff line number	Diff line change
`@@ -2337,8 +2337,8 @@ late_initcall(ubifs_init);`
`2337`	`2337`
`2338`	`2338`	`static void __exit ubifs_exit(void)`
`2339`	`2339`	`{`
`2340`		`- WARN_ON(list_empty(&ubifs_infos));`
`2341`		`- WARN_ON(atomic_long_read(&ubifs_clean_zn_cnt) == 0);`
	`2340`	`+ WARN_ON(!list_empty(&ubifs_infos));`
	`2341`	`+ WARN_ON(atomic_long_read(&ubifs_clean_zn_cnt) != 0);`
`2342`	`2342`
`2343`	`2343`	`dbg_debugfs_exit();`
`2344`	`2344`	`ubifs_compressors_exit();`