Merge branch 'master' of git://git.denx.de/u-boot-ubi
This commit is contained in:
commit
2976d3c150
@ -2461,7 +2461,7 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
|
||||
*/
|
||||
ubi = open_ubi(name, UBI_READONLY);
|
||||
if (IS_ERR(ubi)) {
|
||||
pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
|
||||
pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d\n",
|
||||
current->pid, name, (int)PTR_ERR(ubi));
|
||||
return ERR_CAST(ubi);
|
||||
}
|
||||
@ -2603,7 +2603,7 @@ int ubifs_init(void)
|
||||
* UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2.
|
||||
*/
|
||||
if (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) {
|
||||
pr_err("UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes",
|
||||
pr_err("UBIFS error (pid %d): VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes\n",
|
||||
current->pid, (unsigned int)PAGE_CACHE_SIZE);
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -2632,7 +2632,7 @@ int ubifs_init(void)
|
||||
|
||||
err = register_filesystem(&ubifs_fs_type);
|
||||
if (err) {
|
||||
pr_err("UBIFS error (pid %d): cannot register file system, error %d",
|
||||
pr_err("UBIFS error (pid %d): cannot register file system, error %d\n",
|
||||
current->pid, err);
|
||||
goto out_dbg;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user