1 files changed, 11 insertions, 14 deletions

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index e19d4c0cacae..1e2872b25343 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -6,6 +6,8 @@
  * Copyright (C) 2002 Linus Torvalds.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/thread_info.h>
 #include <asm/current.h>
@@ -475,7 +477,7 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb,
  * annotation because huge_pmd_share() does an allocation under
  * i_mmap_mutex.
  */
-struct lock_class_key hugetlbfs_i_mmap_mutex_key;
+static struct lock_class_key hugetlbfs_i_mmap_mutex_key;
 
 static struct inode *hugetlbfs_get_inode(struct super_block *sb,
                                         struct inode *dir,
@@ -823,8 +825,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
                         ps = memparse(args[0].from, &rest);
                         pconfig->hstate = size_to_hstate(ps);
                         if (!pconfig->hstate) {
-                                printk(KERN_ERR
-                                "hugetlbfs: Unsupported page size %lu MB\n",
+                                pr_err("Unsupported page size %lu MB\n",
                                         ps >> 20);
                                 return -EINVAL;
                         }
@@ -832,8 +833,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
                 }
 
                 default:
-                        printk(KERN_ERR "hugetlbfs: Bad mount option: \"%s\"\n",
-                                 p);
+                        pr_err("Bad mount option: \"%s\"\n", p);
                         return -EINVAL;
                         break;
                 }
@@ -853,8 +853,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
         return 0;
 
 bad_val:
-        printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
-               args[0].from, p);
+        pr_err("Bad value '%s' for mount option '%s'\n", args[0].from, p);
         return -EINVAL;
 }
 
@@ -902,8 +901,7 @@ hugetlbfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto out_free;
         return 0;
 out_free:
-        if (sbinfo->spool)
-                kfree(sbinfo->spool);
+        kfree(sbinfo->spool);
         kfree(sbinfo);
         return -ENOMEM;
 }
@@ -939,7 +937,7 @@ static int get_hstate_idx(int page_size_log)
         return h - hstates;
 }
 
-static struct dentry_operations anon_ops = {
+static const struct dentry_operations anon_ops = {
         .d_dname = simple_dname
 };
 
@@ -970,8 +968,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size,
                 *user = current_user();
                 if (user_shm_lock(size, *user)) {
                         task_lock(current);
-                        printk_once(KERN_WARNING
-                                "%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n",
+                        pr_warn_once("%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n",
                                 current->comm, current->pid);
                         task_unlock(current);
                 } else {
@@ -1031,7 +1028,7 @@ static int __init init_hugetlbfs_fs(void)
         int i;
 
         if (!hugepages_supported()) {
-                pr_info("hugetlbfs: disabling because there are no supported hugepage sizes\n");
+                pr_info("disabling because there are no supported hugepage sizes\n");
                 return -ENOTSUPP;
         }
 
@@ -1060,7 +1057,7 @@ static int __init init_hugetlbfs_fs(void)
                                                         buf);
 
                 if (IS_ERR(hugetlbfs_vfsmount[i])) {
-                        pr_err("hugetlb: Cannot mount internal hugetlbfs for "
+                        pr_err("Cannot mount internal hugetlbfs for "
                                 "page size %uK", ps_kb);
                         error = PTR_ERR(hugetlbfs_vfsmount[i]);
                         hugetlbfs_vfsmount[i] = NULL;