mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
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>
This commit is contained in:
parent
4e1eb88305
commit
0227d6abb3
8 changed files with 58 additions and 54 deletions
|
@ -315,8 +315,7 @@ static unsigned int cachefiles_daemon_poll(struct file *file,
|
|||
static int cachefiles_daemon_range_error(struct cachefiles_cache *cache,
|
||||
char *args)
|
||||
{
|
||||
kerror("Free space limits must be in range"
|
||||
" 0%%<=stop<cull<run<100%%");
|
||||
pr_err("Free space limits must be in range 0%%<=stop<cull<run<100%%");
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -476,12 +475,12 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args)
|
|||
_enter(",%s", args);
|
||||
|
||||
if (!*args) {
|
||||
kerror("Empty directory specified");
|
||||
pr_err("Empty directory specified");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (cache->rootdirname) {
|
||||
kerror("Second cache directory specified");
|
||||
pr_err("Second cache directory specified");
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
|
@ -504,12 +503,12 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args)
|
|||
_enter(",%s", args);
|
||||
|
||||
if (!*args) {
|
||||
kerror("Empty security context specified");
|
||||
pr_err("Empty security context specified");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (cache->secctx) {
|
||||
kerror("Second security context specified");
|
||||
pr_err("Second security context specified");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -532,7 +531,7 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args)
|
|||
_enter(",%s", args);
|
||||
|
||||
if (!*args) {
|
||||
kerror("Empty tag specified");
|
||||
pr_err("Empty tag specified");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -563,12 +562,12 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
|
|||
goto inval;
|
||||
|
||||
if (!test_bit(CACHEFILES_READY, &cache->flags)) {
|
||||
kerror("cull applied to unready cache");
|
||||
pr_err("cull applied to unready cache");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (test_bit(CACHEFILES_DEAD, &cache->flags)) {
|
||||
kerror("cull applied to dead cache");
|
||||
pr_err("cull applied to dead cache");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@ -588,11 +587,11 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
|
|||
|
||||
notdir:
|
||||
path_put(&path);
|
||||
kerror("cull command requires dirfd to be a directory");
|
||||
pr_err("cull command requires dirfd to be a directory");
|
||||
return -ENOTDIR;
|
||||
|
||||
inval:
|
||||
kerror("cull command requires dirfd and filename");
|
||||
pr_err("cull command requires dirfd and filename");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -615,7 +614,7 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args)
|
|||
return 0;
|
||||
|
||||
inval:
|
||||
kerror("debug command requires mask");
|
||||
pr_err("debug command requires mask");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -635,12 +634,12 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
|
|||
goto inval;
|
||||
|
||||
if (!test_bit(CACHEFILES_READY, &cache->flags)) {
|
||||
kerror("inuse applied to unready cache");
|
||||
pr_err("inuse applied to unready cache");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (test_bit(CACHEFILES_DEAD, &cache->flags)) {
|
||||
kerror("inuse applied to dead cache");
|
||||
pr_err("inuse applied to dead cache");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@ -660,11 +659,11 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
|
|||
|
||||
notdir:
|
||||
path_put(&path);
|
||||
kerror("inuse command requires dirfd to be a directory");
|
||||
pr_err("inuse command requires dirfd to be a directory");
|
||||
return -ENOTDIR;
|
||||
|
||||
inval:
|
||||
kerror("inuse command requires dirfd and filename");
|
||||
pr_err("inuse command requires dirfd and filename");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue