fs/cachefiles: replace kerror by pr_err

Also add pr_fmt in internal.h

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index c7f3dd2b79dd..d749731dc0ee 100644
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -50,18 +50,18 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
                cache->brun_percent  < 100);
 
         if (*args) {
-                kerror("'bind' command doesn't take an argument");
+                pr_err("'bind' command doesn't take an argument");
                 return -EINVAL;
         }
 
         if (!cache->rootdirname) {
-                kerror("No cache directory specified");
+                pr_err("No cache directory specified");
                 return -EINVAL;
         }
 
         /* don't permit already bound caches to be re-bound */
         if (test_bit(CACHEFILES_READY, &cache->flags)) {
-                kerror("Cache already bound");
+                pr_err("Cache already bound");
                 return -EBUSY;
         }
 
@@ -228,8 +228,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
         set_bit(CACHEFILES_READY, &cache->flags);
         dput(root);
 
-        pr_info("CacheFiles: File cache on %s registered\n",
-                cache->cache.identifier);
+        pr_info("File cache on %s registered\n", cache->cache.identifier);
 
         /* check how much space the cache has */
         cachefiles_has_space(cache, 0, 0);
@@ -249,7 +248,7 @@ error_open_root:
         kmem_cache_free(cachefiles_object_jar, fsdef);
 error_root_object:
         cachefiles_end_secure(cache, saved_cred);
-        kerror("Failed to register: %d", ret);
+        pr_err("Failed to register: %d", ret);
         return ret;
 }
 
@@ -261,7 +260,7 @@ void cachefiles_daemon_unbind(struct cachefiles_cache *cache)
         _enter("");
 
         if (test_bit(CACHEFILES_READY, &cache->flags)) {
-                pr_info("CacheFiles: File cache on %s unregistering\n",
+                pr_info("File cache on %s unregistering\n",
                         cache->cache.identifier);
 
                 fscache_withdraw_cache(&cache->cache);