X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=fs%2Fubifs%2Fsuper.c;h=291583005dd123e506d61b39f8f45a6c84166083;hb=85a79128c4f5723f812ab8d5ee465ec660e223f1;hp=571c9dc92b94a0b634c4955d0bdc8b6cca6242ae;hpb=b8a77b9a5f9c2ba313f2beef8440b6f9f69768e7;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 571c9dc92b94..291583005dd1 100644
--- 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;