Merge tag 'v3.16' into next

[karo-tx-linux.git] / fs / cachefiles / security.c

diff --git a/fs/cachefiles/security.c b/fs/cachefiles/security.c
index 039b5011d83b0f1481ec200f1229db568f733a02..396c18ea2764116cd9aade503f11348b16c59b11 100644 (file)
--- a/fs/cachefiles/security.c
+++ b/fs/cachefiles/security.c
@@ -34,9 +34,7 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache)
                ret = set_security_override_from_ctx(new, cache->secctx);
                if (ret < 0) {
                        put_cred(new);
-                       printk(KERN_ERR "CacheFiles:"
-                              " Security denies permission to nominate"
-                              " security context: error %d\n",
+                       pr_err("Security denies permission to nominate security context: error %d\n",
                               ret);
                        goto error;
                }
@@ -59,16 +57,14 @@ static int cachefiles_check_cache_dir(struct cachefiles_cache *cache,
 
        ret = security_inode_mkdir(root->d_inode, root, 0);
        if (ret < 0) {
-               printk(KERN_ERR "CacheFiles:"
-                      " Security denies permission to make dirs: error %d",
+               pr_err("Security denies permission to make dirs: error %d",
                       ret);
                return ret;
        }
 
        ret = security_inode_create(root->d_inode, root, 0);
        if (ret < 0)
-               printk(KERN_ERR "CacheFiles:"
-                      " Security denies permission to create files: error %d",
+               pr_err("Security denies permission to create files: error %d",
                       ret);
 
        return ret;