diff options
Diffstat (limited to 'fs/udf/misc.c')
-rw-r--r-- | fs/udf/misc.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/fs/udf/misc.c b/fs/udf/misc.c index 9215700c00a4..c175b4dabc14 100644 --- a/fs/udf/misc.c +++ b/fs/udf/misc.c | |||
@@ -204,6 +204,7 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, | |||
204 | { | 204 | { |
205 | struct tag *tag_p; | 205 | struct tag *tag_p; |
206 | struct buffer_head *bh = NULL; | 206 | struct buffer_head *bh = NULL; |
207 | u8 checksum; | ||
207 | 208 | ||
208 | /* Read the block */ | 209 | /* Read the block */ |
209 | if (block == 0xFFFFFFFF) | 210 | if (block == 0xFFFFFFFF) |
@@ -211,8 +212,8 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, | |||
211 | 212 | ||
212 | bh = udf_tread(sb, block); | 213 | bh = udf_tread(sb, block); |
213 | if (!bh) { | 214 | if (!bh) { |
214 | udf_debug("block=%d, location=%d: read failed\n", | 215 | udf_err(sb, "read failed, block=%u, location=%d\n", |
215 | block, location); | 216 | block, location); |
216 | return NULL; | 217 | return NULL; |
217 | } | 218 | } |
218 | 219 | ||
@@ -227,16 +228,18 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, | |||
227 | } | 228 | } |
228 | 229 | ||
229 | /* Verify the tag checksum */ | 230 | /* Verify the tag checksum */ |
230 | if (udf_tag_checksum(tag_p) != tag_p->tagChecksum) { | 231 | checksum = udf_tag_checksum(tag_p); |
231 | printk(KERN_ERR "udf: tag checksum failed block %d\n", block); | 232 | if (checksum != tag_p->tagChecksum) { |
233 | udf_err(sb, "tag checksum failed, block %u: 0x%02x != 0x%02x\n", | ||
234 | block, checksum, tag_p->tagChecksum); | ||
232 | goto error_out; | 235 | goto error_out; |
233 | } | 236 | } |
234 | 237 | ||
235 | /* Verify the tag version */ | 238 | /* Verify the tag version */ |
236 | if (tag_p->descVersion != cpu_to_le16(0x0002U) && | 239 | if (tag_p->descVersion != cpu_to_le16(0x0002U) && |
237 | tag_p->descVersion != cpu_to_le16(0x0003U)) { | 240 | tag_p->descVersion != cpu_to_le16(0x0003U)) { |
238 | udf_debug("tag version 0x%04x != 0x0002 || 0x0003 block %d\n", | 241 | udf_err(sb, "tag version 0x%04x != 0x0002 || 0x0003, block %u\n", |
239 | le16_to_cpu(tag_p->descVersion), block); | 242 | le16_to_cpu(tag_p->descVersion), block); |
240 | goto error_out; | 243 | goto error_out; |
241 | } | 244 | } |
242 | 245 | ||
@@ -248,8 +251,8 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, | |||
248 | return bh; | 251 | return bh; |
249 | 252 | ||
250 | udf_debug("Crc failure block %d: crc = %d, crclen = %d\n", block, | 253 | udf_debug("Crc failure block %d: crc = %d, crclen = %d\n", block, |
251 | le16_to_cpu(tag_p->descCRC), le16_to_cpu(tag_p->descCRCLength)); | 254 | le16_to_cpu(tag_p->descCRC), |
252 | 255 | le16_to_cpu(tag_p->descCRCLength)); | |
253 | error_out: | 256 | error_out: |
254 | brelse(bh); | 257 | brelse(bh); |
255 | return NULL; | 258 | return NULL; |