common: Drop log.h from common header

[u-boot.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 2c478cba963914af65c8c9c6c9d5f49fcaf47c15..93f268b4cc1f530916eff036f99a71da64e7110c 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * This file is part of UBIFS.
  *
  * Copyright (C) 2006-2008 Nokia Corporation.
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Authors: Artem Bityutskiy (Битюцкий Артём)
  *          Adrian Hunter
  */
@@ -16,6 +15,8 @@
  */
 
 #ifndef __UBOOT__
+#include <log.h>
+#include <dm/devres.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -2361,7 +2362,9 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                return ERR_PTR(err);
        }
 
+#ifndef __UBOOT__
        INIT_HLIST_NODE(&s->s_instances);
+#endif
        INIT_LIST_HEAD(&s->s_inodes);
        s->s_time_gran = 1000000000;
        s->s_flags = flags;
@@ -2430,14 +2433,12 @@ retry:
 #ifndef __UBOOT__
        strlcpy(s->s_id, type->name, sizeof(s->s_id));
        list_add_tail(&s->s_list, &super_blocks);
-#else
-       strncpy(s->s_id, type->name, sizeof(s->s_id));
-#endif
        hlist_add_head(&s->s_instances, &type->fs_supers);
-#ifndef __UBOOT__
        spin_unlock(&sb_lock);
        get_filesystem(type);
        register_shrinker(&s->s_shrink);
+#else
+       strncpy(s->s_id, type->name, sizeof(s->s_id));
 #endif
        return s;
 }
@@ -2462,7 +2463,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);
        }
@@ -2604,7 +2605,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;
        }
@@ -2633,7 +2634,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;
        }