Merge tag 'for-6.5/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[linux-2.6-microblaze.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 1f504ed..2f2e0e6 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3858,6 +3858,7 @@ out:
 static int shmem_show_options(struct seq_file *seq, struct dentry *root)
 {
        struct shmem_sb_info *sbinfo = SHMEM_SB(root->d_sb);
+       struct mempolicy *mpol;
 
        if (sbinfo->max_blocks != shmem_default_max_blocks())
                seq_printf(seq, ",size=%luk",
@@ -3900,7 +3901,9 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
        if (sbinfo->huge)
                seq_printf(seq, ",huge=%s", shmem_format_huge(sbinfo->huge));
 #endif
-       shmem_show_mpol(seq, sbinfo->mpol);
+       mpol = shmem_get_sbmpol(sbinfo);
+       shmem_show_mpol(seq, mpol);
+       mpol_put(mpol);
        if (sbinfo->noswap)
                seq_printf(seq, ",noswap");
        return 0;
@@ -4328,7 +4331,7 @@ static struct file_system_type shmem_fs_type = {
        .name           = "tmpfs",
        .init_fs_context = ramfs_init_fs_context,
        .parameters     = ramfs_fs_parameters,
-       .kill_sb        = kill_litter_super,
+       .kill_sb        = ramfs_kill_sb,
        .fs_flags       = FS_USERNS_MOUNT,
 };