fs/qnx6: use pr_fmt and __func__ in logging

[firefly-linux-kernel-4.4.55.git] / fs / qnx6 / dir.c

diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c
index 2289ea180d44c1fa65e0e4689e3a238d107759d4..c78a3397c5a9550a3b0dd7270ca156024c6b482d 100644 (file)
--- a/fs/qnx6/dir.c
+++ b/fs/qnx6/dir.c
@@ -77,12 +77,12 @@ static int qnx6_dir_longfilename(struct inode *inode,
        if (de->de_size != 0xff) {
                /* error - long filename entries always have size 0xff
                   in direntry */
-               pr_err("qnx6: invalid direntry size (%i).\n", de->de_size);
+               pr_err("invalid direntry size (%i).\n", de->de_size);
                return 0;
        }
        lf = qnx6_longname(s, de, &page);
        if (IS_ERR(lf)) {
-               pr_err("qnx6:Error reading longname\n");
+               pr_err("Error reading longname\n");
                return 0;
        }
 
@@ -90,7 +90,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
 
        if (lf_size > QNX6_LONG_NAME_MAX) {
                QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname));
-               pr_err("qnx6:Filename too long (%i)\n", lf_size);
+               pr_err("Filename too long (%i)\n", lf_size);
                qnx6_put_page(page);
                return 0;
        }
@@ -99,7 +99,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
           mmi 3g filesystem does not have that checksum */
        if (!test_opt(s, MMI_FS) && fs32_to_cpu(sbi, de->de_checksum) !=
                        qnx6_lfile_checksum(lf->lf_fname, lf_size))
-               pr_info("qnx6: long filename checksum error.\n");
+               pr_info("long filename checksum error.\n");
 
        QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n",
                                        lf_size, lf->lf_fname, de_inode));
@@ -135,7 +135,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)
                int i = start;
 
                if (IS_ERR(page)) {
-                       pr_err("qnx6_readdir: read failed\n");
+                       pr_err("%s(): read failed\n", __func__);
                        ctx->pos = (n + 1) << PAGE_CACHE_SHIFT;
                        return PTR_ERR(page);
                }
@@ -258,7 +258,7 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,
                                        if (ino)
                                                goto found;
                                } else
-                                       pr_err("qnx6: undefined filename size in inode.\n");
+                                       pr_err("undefined filename size in inode.\n");
                        }
                        qnx6_put_page(page);
                }