diff options
Diffstat (limited to 'fs/hfsplus/dir.c')
-rw-r--r-- | fs/hfsplus/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 031c24e50521..a37ac934732f 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -103,7 +103,7 @@ again: | |||
103 | } else if (!dentry->d_fsdata) | 103 | } else if (!dentry->d_fsdata) |
104 | dentry->d_fsdata = (void *)(unsigned long)cnid; | 104 | dentry->d_fsdata = (void *)(unsigned long)cnid; |
105 | } else { | 105 | } else { |
106 | printk(KERN_ERR "hfs: invalid catalog entry type in lookup\n"); | 106 | pr_err("invalid catalog entry type in lookup\n"); |
107 | err = -EIO; | 107 | err = -EIO; |
108 | goto fail; | 108 | goto fail; |
109 | } | 109 | } |
@@ -159,12 +159,12 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
159 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, | 159 | hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
160 | fd.entrylength); | 160 | fd.entrylength); |
161 | if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) { | 161 | if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) { |
162 | printk(KERN_ERR "hfs: bad catalog folder thread\n"); | 162 | pr_err("bad catalog folder thread\n"); |
163 | err = -EIO; | 163 | err = -EIO; |
164 | goto out; | 164 | goto out; |
165 | } | 165 | } |
166 | if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) { | 166 | if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) { |
167 | printk(KERN_ERR "hfs: truncated catalog thread\n"); | 167 | pr_err("truncated catalog thread\n"); |
168 | err = -EIO; | 168 | err = -EIO; |
169 | goto out; | 169 | goto out; |
170 | } | 170 | } |
@@ -183,7 +183,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
183 | 183 | ||
184 | for (;;) { | 184 | for (;;) { |
185 | if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) { | 185 | if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) { |
186 | printk(KERN_ERR "hfs: walked past end of dir\n"); | 186 | pr_err("walked past end of dir\n"); |
187 | err = -EIO; | 187 | err = -EIO; |
188 | goto out; | 188 | goto out; |
189 | } | 189 | } |
@@ -203,7 +203,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
203 | if (type == HFSPLUS_FOLDER) { | 203 | if (type == HFSPLUS_FOLDER) { |
204 | if (fd.entrylength < | 204 | if (fd.entrylength < |
205 | sizeof(struct hfsplus_cat_folder)) { | 205 | sizeof(struct hfsplus_cat_folder)) { |
206 | printk(KERN_ERR "hfs: small dir entry\n"); | 206 | pr_err("small dir entry\n"); |
207 | err = -EIO; | 207 | err = -EIO; |
208 | goto out; | 208 | goto out; |
209 | } | 209 | } |
@@ -216,7 +216,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
216 | break; | 216 | break; |
217 | } else if (type == HFSPLUS_FILE) { | 217 | } else if (type == HFSPLUS_FILE) { |
218 | if (fd.entrylength < sizeof(struct hfsplus_cat_file)) { | 218 | if (fd.entrylength < sizeof(struct hfsplus_cat_file)) { |
219 | printk(KERN_ERR "hfs: small file entry\n"); | 219 | pr_err("small file entry\n"); |
220 | err = -EIO; | 220 | err = -EIO; |
221 | goto out; | 221 | goto out; |
222 | } | 222 | } |
@@ -224,7 +224,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
224 | be32_to_cpu(entry.file.id), DT_REG)) | 224 | be32_to_cpu(entry.file.id), DT_REG)) |
225 | break; | 225 | break; |
226 | } else { | 226 | } else { |
227 | printk(KERN_ERR "hfs: bad catalog entry type\n"); | 227 | pr_err("bad catalog entry type\n"); |
228 | err = -EIO; | 228 | err = -EIO; |
229 | goto out; | 229 | goto out; |
230 | } | 230 | } |