~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1749,6 +1749,8 @@
1749	1749	kfree(c->bottom_up_buf);
1750	1750	ubifs_debugging_exit(c);
1751	1751	#ifdef __UBOOT__
	1752	+ ubi_close_volume(c->ubi);
	1753	+ mutex_unlock(&c->umount_mutex);
1752	1754	/* Finally free U-Boot's global copy of superblock */
1753	1755	if (ubifs_sb != NULL) {
1754	1756	free(ubifs_sb->s_fs_info);
..	..	@@ -2050,9 +2052,9 @@
2050	2052	ubifs_umount(c);
2051	2053	#ifndef __UBOOT__
2052	2054	bdi_destroy(&c->bdi);
2053		-#endif
2054	2055	ubi_close_volume(c->ubi);
2055	2056	mutex_unlock(&c->umount_mutex);
	2057	+#endif
2056	2058	}
2057	2059	#endif
2058	2060
..	..	@@ -2319,6 +2321,9 @@
2319	2321
2320	2322	out_umount:
2321	2323	ubifs_umount(c);
	2324	+#ifdef __UBOOT__
	2325	+ goto out;
	2326	+#endif
2322	2327	out_unlock:
2323	2328	mutex_unlock(&c->umount_mutex);
2324	2329	#ifndef __UBOOT__
..	..	@@ -2356,7 +2361,9 @@
2356	2361	return ERR_PTR(err);
2357	2362	}
2358	2363
	2364	+#ifndef __UBOOT__
2359	2365	INIT_HLIST_NODE(&s->s_instances);
	2366	+#endif
2360	2367	INIT_LIST_HEAD(&s->s_inodes);
2361	2368	s->s_time_gran = 1000000000;
2362	2369	s->s_flags = flags;
..	..	@@ -2425,14 +2432,12 @@
2425	2432	#ifndef __UBOOT__
2426	2433	strlcpy(s->s_id, type->name, sizeof(s->s_id));
2427	2434	list_add_tail(&s->s_list, &super_blocks);
2428		-#else
2429		- strncpy(s->s_id, type->name, sizeof(s->s_id));
2430		-#endif
2431	2435	hlist_add_head(&s->s_instances, &type->fs_supers);
2432		-#ifndef __UBOOT__
2433	2436	spin_unlock(&sb_lock);
2434	2437	get_filesystem(type);
2435	2438	register_shrinker(&s->s_shrink);
	2439	+#else
	2440	+ strncpy(s->s_id, type->name, sizeof(s->s_id));
2436	2441	#endif
2437	2442	return s;
2438	2443	}
..	..	@@ -2457,7 +2462,7 @@
2457	2462	*/
2458	2463	ubi = open_ubi(name, UBI_READONLY);
2459	2464	if (IS_ERR(ubi)) {
2460		- pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
	2465	+ pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d\n",
2461	2466	current->pid, name, (int)PTR_ERR(ubi));
2462	2467	return ERR_CAST(ubi);
2463	2468	}
..	..	@@ -2599,7 +2604,7 @@
2599	2604	* UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2.
2600	2605	*/
2601	2606	if (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) {
2602		- pr_err("UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes",
	2607	+ pr_err("UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes\n",
2603	2608	current->pid, (unsigned int)PAGE_CACHE_SIZE);
2604	2609	return -EINVAL;
2605	2610	}
..	..	@@ -2628,7 +2633,7 @@
2628	2633
2629	2634	err = register_filesystem(&ubifs_fs_type);
2630	2635	if (err) {
2631		- pr_err("UBIFS error (pid %d): cannot register file system, error %d",
	2636	+ pr_err("UBIFS error (pid %d): cannot register file system, error %d\n",
2632	2637	current->pid, err);
2633	2638	goto out_dbg;
2634	2639	}