aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/security.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-06 17:37:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:14 -0400
commit4e1eb88305135248ad0e927449e457df95d8d9b3 (patch)
tree5751bb25a6bec21e9863d8f554cb2ae55e99160c /fs/cachefiles/security.c
parentef74885353e0ee4d884604148628df3369c76719 (diff)
FS/CACHEFILES: convert printk to pr_foo()
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/security.c')
-rw-r--r--fs/cachefiles/security.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/cachefiles/security.c b/fs/cachefiles/security.c
index 039b5011d83b..7a6b665f6b1a 100644
--- a/fs/cachefiles/security.c
+++ b/fs/cachefiles/security.c
@@ -34,9 +34,7 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache)
34 ret = set_security_override_from_ctx(new, cache->secctx); 34 ret = set_security_override_from_ctx(new, cache->secctx);
35 if (ret < 0) { 35 if (ret < 0) {
36 put_cred(new); 36 put_cred(new);
37 printk(KERN_ERR "CacheFiles:" 37 pr_err("CacheFiles: Security denies permission to nominate security context: error %d\n",
38 " Security denies permission to nominate"
39 " security context: error %d\n",
40 ret); 38 ret);
41 goto error; 39 goto error;
42 } 40 }
@@ -59,16 +57,14 @@ static int cachefiles_check_cache_dir(struct cachefiles_cache *cache,
59 57
60 ret = security_inode_mkdir(root->d_inode, root, 0); 58 ret = security_inode_mkdir(root->d_inode, root, 0);
61 if (ret < 0) { 59 if (ret < 0) {
62 printk(KERN_ERR "CacheFiles:" 60 pr_err("CacheFiles: Security denies permission to make dirs: error %d",
63 " Security denies permission to make dirs: error %d",
64 ret); 61 ret);
65 return ret; 62 return ret;
66 } 63 }
67 64
68 ret = security_inode_create(root->d_inode, root, 0); 65 ret = security_inode_create(root->d_inode, root, 0);
69 if (ret < 0) 66 if (ret < 0)
70 printk(KERN_ERR "CacheFiles:" 67 pr_err("CacheFiles: Security denies permission to create files: error %d",
71 " Security denies permission to create files: error %d",
72 ret); 68 ret);
73 69
74 return ret; 70 return ret;