diff options
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, | |||
| 77 | if (de->de_size != 0xff) { | 77 | if (de->de_size != 0xff) { |
| 78 | /* error - long filename entries always have size 0xff | 78 | /* error - long filename entries always have size 0xff |
| 79 | in direntry */ | 79 | in direntry */ |
| 80 | printk(KERN_ERR "qnx6: invalid direntry size (%i).\n", | 80 | pr_err("qnx6: invalid direntry size (%i).\n", de->de_size); |
| 81 | de->de_size); | ||
| 82 | return 0; | 81 | return 0; |
| 83 | } | 82 | } |
| 84 | lf = qnx6_longname(s, de, &page); | 83 | lf = qnx6_longname(s, de, &page); |
| 85 | if (IS_ERR(lf)) { | 84 | if (IS_ERR(lf)) { |
| 86 | printk(KERN_ERR "qnx6:Error reading longname\n"); | 85 | pr_err("qnx6:Error reading longname\n"); |
| 87 | return 0; | 86 | return 0; |
| 88 | } | 87 | } |
| 89 | 88 | ||
| @@ -91,7 +90,7 @@ static int qnx6_dir_longfilename(struct inode *inode, | |||
| 91 | 90 | ||
| 92 | if (lf_size > QNX6_LONG_NAME_MAX) { | 91 | if (lf_size > QNX6_LONG_NAME_MAX) { |
| 93 | QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname)); | 92 | QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname)); |
| 94 | printk(KERN_ERR "qnx6:Filename too long (%i)\n", lf_size); | 93 | pr_err("qnx6:Filename too long (%i)\n", lf_size); |
| 95 | qnx6_put_page(page); | 94 | qnx6_put_page(page); |
| 96 | return 0; | 95 | return 0; |
| 97 | } | 96 | } |
| @@ -100,7 +99,7 @@ static int qnx6_dir_longfilename(struct inode *inode, | |||
| 100 | mmi 3g filesystem does not have that checksum */ | 99 | mmi 3g filesystem does not have that checksum */ |
| 101 | if (!test_opt(s, MMI_FS) && fs32_to_cpu(sbi, de->de_checksum) != | 100 | if (!test_opt(s, MMI_FS) && fs32_to_cpu(sbi, de->de_checksum) != |
| 102 | qnx6_lfile_checksum(lf->lf_fname, lf_size)) | 101 | qnx6_lfile_checksum(lf->lf_fname, lf_size)) |
| 103 | printk(KERN_INFO "qnx6: long filename checksum error.\n"); | 102 | pr_info("qnx6: long filename checksum error.\n"); |
| 104 | 103 | ||
| 105 | QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n", | 104 | QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n", |
| 106 | lf_size, lf->lf_fname, de_inode)); | 105 | lf_size, lf->lf_fname, de_inode)); |
| @@ -136,7 +135,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx) | |||
| 136 | int i = start; | 135 | int i = start; |
| 137 | 136 | ||
| 138 | if (IS_ERR(page)) { | 137 | if (IS_ERR(page)) { |
| 139 | printk(KERN_ERR "qnx6_readdir: read failed\n"); | 138 | pr_err("qnx6_readdir: read failed\n"); |
| 140 | ctx->pos = (n + 1) << PAGE_CACHE_SHIFT; | 139 | ctx->pos = (n + 1) << PAGE_CACHE_SHIFT; |
| 141 | return PTR_ERR(page); | 140 | return PTR_ERR(page); |
| 142 | } | 141 | } |
| @@ -259,8 +258,7 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name, | |||
| 259 | if (ino) | 258 | if (ino) |
| 260 | goto found; | 259 | goto found; |
| 261 | } else | 260 | } else |
| 262 | printk(KERN_ERR "qnx6: undefined " | 261 | pr_err("qnx6: undefined filename size in inode.\n"); |
| 263 | "filename size in inode.\n"); | ||
| 264 | } | 262 | } |
| 265 | qnx6_put_page(page); | 263 | qnx6_put_page(page); |
| 266 | } | 264 | } |