aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/bind.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cachefiles/bind.c')
-rw-r--r--fs/cachefiles/bind.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index 5b99bafc31d1..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)
50 cache->brun_percent < 100); 50 cache->brun_percent < 100);
51 51
52 if (*args) { 52 if (*args) {
53 kerror("'bind' command doesn't take an argument"); 53 pr_err("'bind' command doesn't take an argument");
54 return -EINVAL; 54 return -EINVAL;
55 } 55 }
56 56
57 if (!cache->rootdirname) { 57 if (!cache->rootdirname) {
58 kerror("No cache directory specified"); 58 pr_err("No cache directory specified");
59 return -EINVAL; 59 return -EINVAL;
60 } 60 }
61 61
62 /* don't permit already bound caches to be re-bound */ 62 /* don't permit already bound caches to be re-bound */
63 if (test_bit(CACHEFILES_READY, &cache->flags)) { 63 if (test_bit(CACHEFILES_READY, &cache->flags)) {
64 kerror("Cache already bound"); 64 pr_err("Cache already bound");
65 return -EBUSY; 65 return -EBUSY;
66 } 66 }
67 67
@@ -228,9 +228,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
228 set_bit(CACHEFILES_READY, &cache->flags); 228 set_bit(CACHEFILES_READY, &cache->flags);
229 dput(root); 229 dput(root);
230 230
231 printk(KERN_INFO "CacheFiles:" 231 pr_info("File cache on %s registered\n", cache->cache.identifier);
232 " File cache on %s registered\n",
233 cache->cache.identifier);
234 232
235 /* check how much space the cache has */ 233 /* check how much space the cache has */
236 cachefiles_has_space(cache, 0, 0); 234 cachefiles_has_space(cache, 0, 0);
@@ -250,7 +248,7 @@ error_open_root:
250 kmem_cache_free(cachefiles_object_jar, fsdef); 248 kmem_cache_free(cachefiles_object_jar, fsdef);
251error_root_object: 249error_root_object:
252 cachefiles_end_secure(cache, saved_cred); 250 cachefiles_end_secure(cache, saved_cred);
253 kerror("Failed to register: %d", ret); 251 pr_err("Failed to register: %d", ret);
254 return ret; 252 return ret;
255} 253}
256 254
@@ -262,9 +260,8 @@ void cachefiles_daemon_unbind(struct cachefiles_cache *cache)
262 _enter(""); 260 _enter("");
263 261
264 if (test_bit(CACHEFILES_READY, &cache->flags)) { 262 if (test_bit(CACHEFILES_READY, &cache->flags)) {
265 printk(KERN_INFO "CacheFiles:" 263 pr_info("File cache on %s unregistering\n",
266 " File cache on %s unregistering\n", 264 cache->cache.identifier);
267 cache->cache.identifier);
268 265
269 fscache_withdraw_cache(&cache->cache); 266 fscache_withdraw_cache(&cache->cache);
270 } 267 }