Merge tag 'printk-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[linux-2.6-microblaze.git] / fs / ext2 / super.c

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 6c47532..987bcf3 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -206,9 +206,6 @@ static void init_once(void *foo)
        init_rwsem(&ei->xattr_sem);
 #endif
        mutex_init(&ei->truncate_mutex);
-#ifdef CONFIG_FS_DAX
-       init_rwsem(&ei->dax_sem);
-#endif
        inode_init_once(&ei->vfs_inode);
 }
 
@@ -1104,7 +1101,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        get_random_bytes(&sbi->s_next_generation, sizeof(u32));
        spin_lock_init(&sbi->s_next_gen_lock);
 
-       /* per fileystem reservation list head & lock */
+       /* per filesystem reservation list head & lock */
        spin_lock_init(&sbi->s_rsv_window_lock);
        sbi->s_rsv_window_root = RB_ROOT;
        /*
@@ -1399,7 +1396,6 @@ static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf)
        struct super_block *sb = dentry->d_sb;
        struct ext2_sb_info *sbi = EXT2_SB(sb);
        struct ext2_super_block *es = sbi->s_es;
-       u64 fsid;
 
        spin_lock(&sbi->s_lock);
 
@@ -1453,9 +1449,7 @@ static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf)
        buf->f_ffree = ext2_count_free_inodes(sb);
        es->s_free_inodes_count = cpu_to_le32(buf->f_ffree);
        buf->f_namelen = EXT2_NAME_LEN;
-       fsid = le64_to_cpup((void *)es->s_uuid) ^
-              le64_to_cpup((void *)es->s_uuid + sizeof(u64));
-       buf->f_fsid = u64_to_fsid(fsid);
+       buf->f_fsid = uuid_to_fsid(es->s_uuid);
        spin_unlock(&sbi->s_lock);
        return 0;
 }