diff options
author | Bob Copeland <me@bobcopeland.com> | 2008-04-17 03:47:48 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2008-04-17 08:29:56 -0400 |
commit | f845fced913b1437659bb5baf187698547697afe (patch) | |
tree | e23244018eeb8a57229ef0f12f69521a50881e14 /fs/udf/super.c | |
parent | 706047a79725b585cf272fdefc234b31b6545c72 (diff) |
udf: use crc_itu_t from lib instead of udf_crc
As pointed out by Sergey Vlasov, UDF implements its own version of
the CRC ITU-T V.41. Convert it to use the one in the library.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Cc: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 6823733c0121..b564fc140fe4 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #include <linux/mount.h> | 56 | #include <linux/mount.h> |
57 | #include <linux/seq_file.h> | 57 | #include <linux/seq_file.h> |
58 | #include <linux/bitmap.h> | 58 | #include <linux/bitmap.h> |
59 | #include <linux/crc-itu-t.h> | ||
59 | #include <asm/byteorder.h> | 60 | #include <asm/byteorder.h> |
60 | 61 | ||
61 | #include "udf_sb.h" | 62 | #include "udf_sb.h" |
@@ -1765,8 +1766,8 @@ static void udf_open_lvid(struct super_block *sb) | |||
1765 | lvid->integrityType = LVID_INTEGRITY_TYPE_OPEN; | 1766 | lvid->integrityType = LVID_INTEGRITY_TYPE_OPEN; |
1766 | 1767 | ||
1767 | lvid->descTag.descCRC = cpu_to_le16( | 1768 | lvid->descTag.descCRC = cpu_to_le16( |
1768 | udf_crc((char *)lvid + sizeof(tag), | 1769 | crc_itu_t(0, (char *)lvid + sizeof(tag), |
1769 | le16_to_cpu(lvid->descTag.descCRCLength), 0)); | 1770 | le16_to_cpu(lvid->descTag.descCRCLength))); |
1770 | 1771 | ||
1771 | lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag); | 1772 | lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag); |
1772 | mark_buffer_dirty(bh); | 1773 | mark_buffer_dirty(bh); |
@@ -1800,9 +1801,8 @@ static void udf_close_lvid(struct super_block *sb) | |||
1800 | lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE); | 1801 | lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE); |
1801 | 1802 | ||
1802 | lvid->descTag.descCRC = cpu_to_le16( | 1803 | lvid->descTag.descCRC = cpu_to_le16( |
1803 | udf_crc((char *)lvid + sizeof(tag), | 1804 | crc_itu_t(0, (char *)lvid + sizeof(tag), |
1804 | le16_to_cpu(lvid->descTag.descCRCLength), | 1805 | le16_to_cpu(lvid->descTag.descCRCLength))); |
1805 | 0)); | ||
1806 | 1806 | ||
1807 | lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag); | 1807 | lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag); |
1808 | mark_buffer_dirty(bh); | 1808 | mark_buffer_dirty(bh); |