diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:37:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:14 -0400 |
commit | 0227d6abb378454e10d385da6a0f8b79a5b02c27 (patch) | |
tree | e85a3019e054d8cbbaa20f0b98a30653a0432701 /fs/cachefiles/main.c | |
parent | 4e1eb88305135248ad0e927449e457df95d8d9b3 (diff) |
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>
Diffstat (limited to 'fs/cachefiles/main.c')
-rw-r--r-- | fs/cachefiles/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cachefiles/main.c b/fs/cachefiles/main.c index d45c59c147ce..180edfb45f66 100644 --- a/fs/cachefiles/main.c +++ b/fs/cachefiles/main.c | |||
@@ -68,7 +68,7 @@ static int __init cachefiles_init(void) | |||
68 | SLAB_HWCACHE_ALIGN, | 68 | SLAB_HWCACHE_ALIGN, |
69 | cachefiles_object_init_once); | 69 | cachefiles_object_init_once); |
70 | if (!cachefiles_object_jar) { | 70 | if (!cachefiles_object_jar) { |
71 | pr_notice("CacheFiles: Failed to allocate an object jar\n"); | 71 | pr_notice("Failed to allocate an object jar\n"); |
72 | goto error_object_jar; | 72 | goto error_object_jar; |
73 | } | 73 | } |
74 | 74 | ||
@@ -76,7 +76,7 @@ static int __init cachefiles_init(void) | |||
76 | if (ret < 0) | 76 | if (ret < 0) |
77 | goto error_proc; | 77 | goto error_proc; |
78 | 78 | ||
79 | pr_info("CacheFiles: Loaded\n"); | 79 | pr_info("Loaded\n"); |
80 | return 0; | 80 | return 0; |
81 | 81 | ||
82 | error_proc: | 82 | error_proc: |
@@ -84,7 +84,7 @@ error_proc: | |||
84 | error_object_jar: | 84 | error_object_jar: |
85 | misc_deregister(&cachefiles_dev); | 85 | misc_deregister(&cachefiles_dev); |
86 | error_dev: | 86 | error_dev: |
87 | kerror("failed to register: %d", ret); | 87 | pr_err("failed to register: %d", ret); |
88 | return ret; | 88 | return ret; |
89 | } | 89 | } |
90 | 90 | ||
@@ -95,7 +95,7 @@ fs_initcall(cachefiles_init); | |||
95 | */ | 95 | */ |
96 | static void __exit cachefiles_exit(void) | 96 | static void __exit cachefiles_exit(void) |
97 | { | 97 | { |
98 | pr_info("CacheFiles: Unloading\n"); | 98 | pr_info("Unloading\n"); |
99 | 99 | ||
100 | cachefiles_proc_cleanup(); | 100 | cachefiles_proc_cleanup(); |
101 | kmem_cache_destroy(cachefiles_object_jar); | 101 | kmem_cache_destroy(cachefiles_object_jar); |