Merge branch 'next' into for-linus

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,
 {
         struct tag *tag_p;
         struct buffer_head *bh = NULL;
+        u8 checksum;
 
         /* Read the block */
         if (block == 0xFFFFFFFF)
@@ -211,8 +212,8 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
 
         bh = udf_tread(sb, block);
         if (!bh) {
-                udf_debug("block=%d, location=%d: read failed\n",
-                          block, location);
+                udf_err(sb, "read failed, block=%u, location=%d\n",
+                        block, location);
                 return NULL;
         }
 
@@ -227,16 +228,18 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
         }
 
         /* Verify the tag checksum */
-        if (udf_tag_checksum(tag_p) != tag_p->tagChecksum) {
-                printk(KERN_ERR "udf: tag checksum failed block %d\n", block);
+        checksum = udf_tag_checksum(tag_p);
+        if (checksum != tag_p->tagChecksum) {
+                udf_err(sb, "tag checksum failed, block %u: 0x%02x != 0x%02x\n",
+                        block, checksum, tag_p->tagChecksum);
                 goto error_out;
         }
 
         /* Verify the tag version */
         if (tag_p->descVersion != cpu_to_le16(0x0002U) &&
             tag_p->descVersion != cpu_to_le16(0x0003U)) {
-                udf_debug("tag version 0x%04x != 0x0002 || 0x0003 block %d\n",
-                          le16_to_cpu(tag_p->descVersion), block);
+                udf_err(sb, "tag version 0x%04x != 0x0002 || 0x0003, block %u\n",
+                        le16_to_cpu(tag_p->descVersion), block);
                 goto error_out;
         }
 
@@ -248,8 +251,8 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
                 return bh;
 
         udf_debug("Crc failure block %d: crc = %d, crclen = %d\n", block,
-            le16_to_cpu(tag_p->descCRC), le16_to_cpu(tag_p->descCRCLength));
-
+                  le16_to_cpu(tag_p->descCRC),
+                  le16_to_cpu(tag_p->descCRCLength));
 error_out:
         brelse(bh);
         return NULL;