Merge tag 'efi-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index efbbf2bc68fb2c2eee85f84c19cab69251ce3b5b..c8f7540ef048ebc5b425ed640999acf361819cd7 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3475,9 +3475,9 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
        return 0;
 
 unsupported_parameter:
-       return invalf(fc, "tmpfs: Unsupported parameter '%s'", param->key);
+       return invalfc(fc, "Unsupported parameter '%s'", param->key);
 bad_value:
-       return invalf(fc, "tmpfs: Bad value for '%s'", param->key);
+       return invalfc(fc, "Bad value for '%s'", param->key);
 }
 
 static int shmem_parse_options(struct fs_context *fc, void *data)
@@ -3583,7 +3583,7 @@ static int shmem_reconfigure(struct fs_context *fc)
        return 0;
 out:
        spin_unlock(&sbinfo->stat_lock);
-       return invalf(fc, "tmpfs: %s", err);
+       return invalfc(fc, "%s", err);
 }
 
 static int shmem_show_options(struct seq_file *seq, struct dentry *root)