Merge tag 'ubifs-for-linus-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 571c9dc92b94a0b634c4955d0bdc8b6cca6242ae..291583005dd123e506d61b39f8f45a6c84166083 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2241,13 +2241,14 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
                goto out_umount;
        }
 
+       generic_set_sb_d_ops(sb);
        sb->s_root = d_make_root(root);
        if (!sb->s_root) {
                err = -ENOMEM;
                goto out_umount;
        }
 
-       import_uuid(&sb->s_uuid, c->uuid);
+       super_set_uuid(sb, c->uuid, sizeof(c->uuid));
 
        mutex_unlock(&c->umount_mutex);
        return 0;
@@ -2435,8 +2436,8 @@ static int __init ubifs_init(void)
 
        ubifs_inode_slab = kmem_cache_create("ubifs_inode_slab",
                                sizeof(struct ubifs_inode), 0,
-                               SLAB_MEM_SPREAD | SLAB_RECLAIM_ACCOUNT |
-                               SLAB_ACCOUNT, &inode_slab_ctor);
+                               SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
+                               &inode_slab_ctor);
        if (!ubifs_inode_slab)
                return -ENOMEM;