Merge branch 'master' of git://git.denx.de/u-boot-ubi

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

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 2c478cba963914af65c8c9c6c9d5f49fcaf47c15..9603163d8a04129f3017c500ad668344e5872168 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
  */
@@ -2361,7 +2360,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 +2431,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;
 }