aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/namei.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-09-25 19:05:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-26 11:10:35 -0400
commit6ff66ac77aeaa9c13db28784e1c50c027a1f487b (patch)
tree7c9d42c5b8d1e417523743a7d1215692cffa7368 /fs/cachefiles/namei.c
parent6f3aabd183984120acb59f5d57a45cfa7455be9a (diff)
fs/cachefiles: add missing \n to kerror conversions
Commit 0227d6abb378 ("fs/cachefiles: replace kerror by pr_err") didn't include newline featuring in original kerror definition Signed-off-by: Fabian Frederick <fabf@skynet.be> Reported-by: David Howells <dhowells@redhat.com> Acked-by: David Howells <dhowells@redhat.com> Cc: <stable@vger.kernel.org> [3.16.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/cachefiles/namei.c')
-rw-r--r--fs/cachefiles/namei.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 83e9c94ca2cf..dad7d9542a24 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -543,7 +543,7 @@ lookup_again:
543 next, next->d_inode, next->d_inode->i_ino); 543 next, next->d_inode, next->d_inode->i_ino);
544 544
545 } else if (!S_ISDIR(next->d_inode->i_mode)) { 545 } else if (!S_ISDIR(next->d_inode->i_mode)) {
546 pr_err("inode %lu is not a directory", 546 pr_err("inode %lu is not a directory\n",
547 next->d_inode->i_ino); 547 next->d_inode->i_ino);
548 ret = -ENOBUFS; 548 ret = -ENOBUFS;
549 goto error; 549 goto error;
@@ -574,7 +574,7 @@ lookup_again:
574 } else if (!S_ISDIR(next->d_inode->i_mode) && 574 } else if (!S_ISDIR(next->d_inode->i_mode) &&
575 !S_ISREG(next->d_inode->i_mode) 575 !S_ISREG(next->d_inode->i_mode)
576 ) { 576 ) {
577 pr_err("inode %lu is not a file or directory", 577 pr_err("inode %lu is not a file or directory\n",
578 next->d_inode->i_ino); 578 next->d_inode->i_ino);
579 ret = -ENOBUFS; 579 ret = -ENOBUFS;
580 goto error; 580 goto error;
@@ -768,7 +768,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
768 ASSERT(subdir->d_inode); 768 ASSERT(subdir->d_inode);
769 769
770 if (!S_ISDIR(subdir->d_inode->i_mode)) { 770 if (!S_ISDIR(subdir->d_inode->i_mode)) {
771 pr_err("%s is not a directory", dirname); 771 pr_err("%s is not a directory\n", dirname);
772 ret = -EIO; 772 ret = -EIO;
773 goto check_error; 773 goto check_error;
774 } 774 }
@@ -796,13 +796,13 @@ check_error:
796mkdir_error: 796mkdir_error:
797 mutex_unlock(&dir->d_inode->i_mutex); 797 mutex_unlock(&dir->d_inode->i_mutex);
798 dput(subdir); 798 dput(subdir);
799 pr_err("mkdir %s failed with error %d", dirname, ret); 799 pr_err("mkdir %s failed with error %d\n", dirname, ret);
800 return ERR_PTR(ret); 800 return ERR_PTR(ret);
801 801
802lookup_error: 802lookup_error:
803 mutex_unlock(&dir->d_inode->i_mutex); 803 mutex_unlock(&dir->d_inode->i_mutex);
804 ret = PTR_ERR(subdir); 804 ret = PTR_ERR(subdir);
805 pr_err("Lookup %s failed with error %d", dirname, ret); 805 pr_err("Lookup %s failed with error %d\n", dirname, ret);
806 return ERR_PTR(ret); 806 return ERR_PTR(ret);
807 807
808nomem_d_alloc: 808nomem_d_alloc:
@@ -892,7 +892,7 @@ lookup_error:
892 if (ret == -EIO) { 892 if (ret == -EIO) {
893 cachefiles_io_error(cache, "Lookup failed"); 893 cachefiles_io_error(cache, "Lookup failed");
894 } else if (ret != -ENOMEM) { 894 } else if (ret != -ENOMEM) {
895 pr_err("Internal error: %d", ret); 895 pr_err("Internal error: %d\n", ret);
896 ret = -EIO; 896 ret = -EIO;
897 } 897 }
898 898
@@ -951,7 +951,7 @@ error:
951 } 951 }
952 952
953 if (ret != -ENOMEM) { 953 if (ret != -ENOMEM) {
954 pr_err("Internal error: %d", ret); 954 pr_err("Internal error: %d\n", ret);
955 ret = -EIO; 955 ret = -EIO;
956 } 956 }
957 957