Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 8335dbd3fc358ed1fe9d6521785ecee1dc031313..526149846d0a82370eaf96c32489a45152fd4f66 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2615,13 +2615,15 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
         * tmpfs instance, limiting inodes to one per page of lowmem;
         * but the internal instance is left unlimited.
         */
-       if (!(sb->s_flags & MS_NOUSER)) {
+       if (!(sb->s_flags & MS_KERNMOUNT)) {
                sbinfo->max_blocks = shmem_default_max_blocks();
                sbinfo->max_inodes = shmem_default_max_inodes();
                if (shmem_parse_options(data, sbinfo, false)) {
                        err = -EINVAL;
                        goto failed;
                }
+       } else {
+               sb->s_flags |= MS_NOUSER;
        }
        sb->s_export_op = &shmem_export_ops;
        sb->s_flags |= MS_NOSEC;
@@ -2831,8 +2833,7 @@ int __init shmem_init(void)
                goto out2;
        }
 
-       shm_mnt = vfs_kern_mount(&shmem_fs_type, MS_NOUSER,
-                                shmem_fs_type.name, NULL);
+       shm_mnt = kern_mount(&shmem_fs_type);
        if (IS_ERR(shm_mnt)) {
                error = PTR_ERR(shm_mnt);
                printk(KERN_ERR "Could not kern_mount tmpfs\n");
@@ -2909,14 +2910,8 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
 
 /* common code */
 
-static char *shmem_dname(struct dentry *dentry, char *buffer, int buflen)
-{
-       return dynamic_dname(dentry, buffer, buflen, "/%s (deleted)",
-                               dentry->d_name.name);
-}
-
 static struct dentry_operations anon_ops = {
-       .d_dname = shmem_dname
+       .d_dname = simple_dname
 };
 
 /**