Commit 152f5bed authored by Fabian Frederick's avatar Fabian Frederick Committed by Greg Kroah-Hartman

fs/cachefiles: add missing \n to kerror conversions

commit 6ff66ac7 upstream.

Commit 0227d6ab ("fs/cachefiles: replace kerror by pr_err") didn't
include newline featuring in original kerror definition
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Reported-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5eae161
...@@ -50,18 +50,18 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) ...@@ -50,18 +50,18 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
cache->brun_percent < 100); cache->brun_percent < 100);
if (*args) { if (*args) {
pr_err("'bind' command doesn't take an argument"); pr_err("'bind' command doesn't take an argument\n");
return -EINVAL; return -EINVAL;
} }
if (!cache->rootdirname) { if (!cache->rootdirname) {
pr_err("No cache directory specified"); pr_err("No cache directory specified\n");
return -EINVAL; return -EINVAL;
} }
/* don't permit already bound caches to be re-bound */ /* don't permit already bound caches to be re-bound */
if (test_bit(CACHEFILES_READY, &cache->flags)) { if (test_bit(CACHEFILES_READY, &cache->flags)) {
pr_err("Cache already bound"); pr_err("Cache already bound\n");
return -EBUSY; return -EBUSY;
} }
...@@ -248,7 +248,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache) ...@@ -248,7 +248,7 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
kmem_cache_free(cachefiles_object_jar, fsdef); kmem_cache_free(cachefiles_object_jar, fsdef);
error_root_object: error_root_object:
cachefiles_end_secure(cache, saved_cred); cachefiles_end_secure(cache, saved_cred);
pr_err("Failed to register: %d", ret); pr_err("Failed to register: %d\n", ret);
return ret; return ret;
} }
......
...@@ -315,7 +315,7 @@ static unsigned int cachefiles_daemon_poll(struct file *file, ...@@ -315,7 +315,7 @@ static unsigned int cachefiles_daemon_poll(struct file *file,
static int cachefiles_daemon_range_error(struct cachefiles_cache *cache, static int cachefiles_daemon_range_error(struct cachefiles_cache *cache,
char *args) char *args)
{ {
pr_err("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%%\n");
return -EINVAL; return -EINVAL;
} }
...@@ -475,12 +475,12 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args) ...@@ -475,12 +475,12 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args)
_enter(",%s", args); _enter(",%s", args);
if (!*args) { if (!*args) {
pr_err("Empty directory specified"); pr_err("Empty directory specified\n");
return -EINVAL; return -EINVAL;
} }
if (cache->rootdirname) { if (cache->rootdirname) {
pr_err("Second cache directory specified"); pr_err("Second cache directory specified\n");
return -EEXIST; return -EEXIST;
} }
...@@ -503,12 +503,12 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args) ...@@ -503,12 +503,12 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args)
_enter(",%s", args); _enter(",%s", args);
if (!*args) { if (!*args) {
pr_err("Empty security context specified"); pr_err("Empty security context specified\n");
return -EINVAL; return -EINVAL;
} }
if (cache->secctx) { if (cache->secctx) {
pr_err("Second security context specified"); pr_err("Second security context specified\n");
return -EINVAL; return -EINVAL;
} }
...@@ -531,7 +531,7 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args) ...@@ -531,7 +531,7 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args)
_enter(",%s", args); _enter(",%s", args);
if (!*args) { if (!*args) {
pr_err("Empty tag specified"); pr_err("Empty tag specified\n");
return -EINVAL; return -EINVAL;
} }
...@@ -562,12 +562,12 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args) ...@@ -562,12 +562,12 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
goto inval; goto inval;
if (!test_bit(CACHEFILES_READY, &cache->flags)) { if (!test_bit(CACHEFILES_READY, &cache->flags)) {
pr_err("cull applied to unready cache"); pr_err("cull applied to unready cache\n");
return -EIO; return -EIO;
} }
if (test_bit(CACHEFILES_DEAD, &cache->flags)) { if (test_bit(CACHEFILES_DEAD, &cache->flags)) {
pr_err("cull applied to dead cache"); pr_err("cull applied to dead cache\n");
return -EIO; return -EIO;
} }
...@@ -587,11 +587,11 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args) ...@@ -587,11 +587,11 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
notdir: notdir:
path_put(&path); path_put(&path);
pr_err("cull command requires dirfd to be a directory"); pr_err("cull command requires dirfd to be a directory\n");
return -ENOTDIR; return -ENOTDIR;
inval: inval:
pr_err("cull command requires dirfd and filename"); pr_err("cull command requires dirfd and filename\n");
return -EINVAL; return -EINVAL;
} }
...@@ -614,7 +614,7 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args) ...@@ -614,7 +614,7 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args)
return 0; return 0;
inval: inval:
pr_err("debug command requires mask"); pr_err("debug command requires mask\n");
return -EINVAL; return -EINVAL;
} }
...@@ -634,12 +634,12 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args) ...@@ -634,12 +634,12 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
goto inval; goto inval;
if (!test_bit(CACHEFILES_READY, &cache->flags)) { if (!test_bit(CACHEFILES_READY, &cache->flags)) {
pr_err("inuse applied to unready cache"); pr_err("inuse applied to unready cache\n");
return -EIO; return -EIO;
} }
if (test_bit(CACHEFILES_DEAD, &cache->flags)) { if (test_bit(CACHEFILES_DEAD, &cache->flags)) {
pr_err("inuse applied to dead cache"); pr_err("inuse applied to dead cache\n");
return -EIO; return -EIO;
} }
...@@ -659,11 +659,11 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args) ...@@ -659,11 +659,11 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
notdir: notdir:
path_put(&path); path_put(&path);
pr_err("inuse command requires dirfd to be a directory"); pr_err("inuse command requires dirfd to be a directory\n");
return -ENOTDIR; return -ENOTDIR;
inval: inval:
pr_err("inuse command requires dirfd and filename"); pr_err("inuse command requires dirfd and filename\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -255,7 +255,7 @@ extern int cachefiles_remove_object_xattr(struct cachefiles_cache *cache, ...@@ -255,7 +255,7 @@ extern int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,
#define cachefiles_io_error(___cache, FMT, ...) \ #define cachefiles_io_error(___cache, FMT, ...) \
do { \ do { \
pr_err("I/O Error: " FMT, ##__VA_ARGS__); \ pr_err("I/O Error: " FMT"\n", ##__VA_ARGS__); \
fscache_io_error(&(___cache)->cache); \ fscache_io_error(&(___cache)->cache); \
set_bit(CACHEFILES_DEAD, &(___cache)->flags); \ set_bit(CACHEFILES_DEAD, &(___cache)->flags); \
} while (0) } while (0)
......
...@@ -84,7 +84,7 @@ static int __init cachefiles_init(void) ...@@ -84,7 +84,7 @@ static int __init cachefiles_init(void)
error_object_jar: error_object_jar:
misc_deregister(&cachefiles_dev); misc_deregister(&cachefiles_dev);
error_dev: error_dev:
pr_err("failed to register: %d", ret); pr_err("failed to register: %d\n", ret);
return ret; return ret;
} }
......
...@@ -543,7 +543,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, ...@@ -543,7 +543,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent,
next, next->d_inode, next->d_inode->i_ino); next, next->d_inode, next->d_inode->i_ino);
} else if (!S_ISDIR(next->d_inode->i_mode)) { } else if (!S_ISDIR(next->d_inode->i_mode)) {
pr_err("inode %lu is not a directory", pr_err("inode %lu is not a directory\n",
next->d_inode->i_ino); next->d_inode->i_ino);
ret = -ENOBUFS; ret = -ENOBUFS;
goto error; goto error;
...@@ -574,7 +574,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, ...@@ -574,7 +574,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent,
} else if (!S_ISDIR(next->d_inode->i_mode) && } else if (!S_ISDIR(next->d_inode->i_mode) &&
!S_ISREG(next->d_inode->i_mode) !S_ISREG(next->d_inode->i_mode)
) { ) {
pr_err("inode %lu is not a file or directory", pr_err("inode %lu is not a file or directory\n",
next->d_inode->i_ino); next->d_inode->i_ino);
ret = -ENOBUFS; ret = -ENOBUFS;
goto error; goto error;
...@@ -768,7 +768,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, ...@@ -768,7 +768,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
ASSERT(subdir->d_inode); ASSERT(subdir->d_inode);
if (!S_ISDIR(subdir->d_inode->i_mode)) { if (!S_ISDIR(subdir->d_inode->i_mode)) {
pr_err("%s is not a directory", dirname); pr_err("%s is not a directory\n", dirname);
ret = -EIO; ret = -EIO;
goto check_error; goto check_error;
} }
...@@ -795,13 +795,13 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, ...@@ -795,13 +795,13 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
mkdir_error: mkdir_error:
mutex_unlock(&dir->d_inode->i_mutex); mutex_unlock(&dir->d_inode->i_mutex);
dput(subdir); dput(subdir);
pr_err("mkdir %s failed with error %d", dirname, ret); pr_err("mkdir %s failed with error %d\n", dirname, ret);
return ERR_PTR(ret); return ERR_PTR(ret);
lookup_error: lookup_error:
mutex_unlock(&dir->d_inode->i_mutex); mutex_unlock(&dir->d_inode->i_mutex);
ret = PTR_ERR(subdir); ret = PTR_ERR(subdir);
pr_err("Lookup %s failed with error %d", dirname, ret); pr_err("Lookup %s failed with error %d\n", dirname, ret);
return ERR_PTR(ret); return ERR_PTR(ret);
nomem_d_alloc: nomem_d_alloc:
...@@ -891,7 +891,7 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache, ...@@ -891,7 +891,7 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache,
if (ret == -EIO) { if (ret == -EIO) {
cachefiles_io_error(cache, "Lookup failed"); cachefiles_io_error(cache, "Lookup failed");
} else if (ret != -ENOMEM) { } else if (ret != -ENOMEM) {
pr_err("Internal error: %d", ret); pr_err("Internal error: %d\n", ret);
ret = -EIO; ret = -EIO;
} }
...@@ -950,7 +950,7 @@ int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir, ...@@ -950,7 +950,7 @@ int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir,
} }
if (ret != -ENOMEM) { if (ret != -ENOMEM) {
pr_err("Internal error: %d", ret); pr_err("Internal error: %d\n", ret);
ret = -EIO; ret = -EIO;
} }
......
...@@ -51,7 +51,7 @@ int cachefiles_check_object_type(struct cachefiles_object *object) ...@@ -51,7 +51,7 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
} }
if (ret != -EEXIST) { if (ret != -EEXIST) {
pr_err("Can't set xattr on %*.*s [%lu] (err %d)", pr_err("Can't set xattr on %*.*s [%lu] (err %d)\n",
dentry->d_name.len, dentry->d_name.len, dentry->d_name.len, dentry->d_name.len,
dentry->d_name.name, dentry->d_inode->i_ino, dentry->d_name.name, dentry->d_inode->i_ino,
-ret); -ret);
...@@ -64,7 +64,7 @@ int cachefiles_check_object_type(struct cachefiles_object *object) ...@@ -64,7 +64,7 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
if (ret == -ERANGE) if (ret == -ERANGE)
goto bad_type_length; goto bad_type_length;
pr_err("Can't read xattr on %*.*s [%lu] (err %d)", pr_err("Can't read xattr on %*.*s [%lu] (err %d)\n",
dentry->d_name.len, dentry->d_name.len, dentry->d_name.len, dentry->d_name.len,
dentry->d_name.name, dentry->d_inode->i_ino, dentry->d_name.name, dentry->d_inode->i_ino,
-ret); -ret);
...@@ -85,14 +85,14 @@ int cachefiles_check_object_type(struct cachefiles_object *object) ...@@ -85,14 +85,14 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
return ret; return ret;
bad_type_length: bad_type_length:
pr_err("Cache object %lu type xattr length incorrect", pr_err("Cache object %lu type xattr length incorrect\n",
dentry->d_inode->i_ino); dentry->d_inode->i_ino);
ret = -EIO; ret = -EIO;
goto error; goto error;
bad_type: bad_type:
xtype[2] = 0; xtype[2] = 0;
pr_err("Cache object %*.*s [%lu] type %s not %s", pr_err("Cache object %*.*s [%lu] type %s not %s\n",
dentry->d_name.len, dentry->d_name.len, dentry->d_name.len, dentry->d_name.len,
dentry->d_name.name, dentry->d_inode->i_ino, dentry->d_name.name, dentry->d_inode->i_ino,
xtype, type); xtype, type);
...@@ -293,7 +293,7 @@ int cachefiles_check_object_xattr(struct cachefiles_object *object, ...@@ -293,7 +293,7 @@ int cachefiles_check_object_xattr(struct cachefiles_object *object,
return ret; return ret;
bad_type_length: bad_type_length:
pr_err("Cache object %lu xattr length incorrect", pr_err("Cache object %lu xattr length incorrect\n",
dentry->d_inode->i_ino); dentry->d_inode->i_ino);
ret = -EIO; ret = -EIO;
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment