diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-08-08 14:23:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 15:57:25 -0700 |
| commit | e00d5b5ad70c6c4fb978fe843c0bbb3294d63223 (patch) | |
| tree | 41a5b76e1e8719c8249ad2359aff2cf5ee7344f7 /fs/qnx6/dir.c | |
| parent | b6d53b1b113492632bdc37ee9ab1dda8b9a4bf34 (diff) | |
| download | linux-e00d5b5ad70c6c4fb978fe843c0bbb3294d63223.tar.bz2 | |
fs/qnx6: convert printk to pr_foo()
Use current logging functions.
Coalesce formats.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Cc: Kai Bankett <chaosman@ontika.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/qnx6/dir.c')
| -rw-r--r-- | fs/qnx6/dir.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c index 15b7d92ed60d..2289ea180d44 100644 --- a/fs/qnx6/dir.c +++ b/fs/qnx6/dir.c @@ -77,13 +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 */ - printk(KERN_ERR "qnx6: invalid direntry size (%i).\n", - de->de_size); + pr_err("qnx6: invalid direntry size (%i).\n", de->de_size); return 0; } lf = qnx6_longname(s, de, &page); if (IS_ERR(lf)) { - printk(KERN_ERR "qnx6:Error reading longname\n"); + pr_err("qnx6:Error reading longname\n"); return 0; } @@ -91,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)); - printk(KERN_ERR "qnx6:Filename too long (%i)\n", lf_size); + pr_err("qnx6:Filename too long (%i)\n", lf_size); qnx6_put_page(page); return 0; } @@ -100,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)) - printk(KERN_INFO "qnx6: long filename checksum error.\n"); + pr_info("qnx6: long filename checksum error.\n"); QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n", lf_size, lf->lf_fname, de_inode)); @@ -136,7 +135,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx) int i = start; if (IS_ERR(page)) { - printk(KERN_ERR "qnx6_readdir: read failed\n"); + pr_err("qnx6_readdir: read failed\n"); ctx->pos = (n + 1) << PAGE_CACHE_SHIFT; return PTR_ERR(page); } @@ -259,8 +258,7 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name, if (ino) goto found; } else - printk(KERN_ERR "qnx6: undefined " - "filename size in inode.\n"); + pr_err("qnx6: undefined filename size in inode.\n"); } qnx6_put_page(page); } |