diff options
| author | Karel Zak | 2018-05-28 09:58:19 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-05-28 09:58:19 +0200 |
| commit | 5ac0b2699411acd952189f6532941bf5119b36d8 (patch) | |
| tree | 8c132e169eca98c10ffc303dc54abb76d1fa63c9 /libblkid | |
| parent | libblkid: (ntfs) fix cluster size check (diff) | |
| parent | libblkid: udf: Fix reporting UDF 2.60 revision (diff) | |
| download | kernel-qcow2-util-linux-5ac0b2699411acd952189f6532941bf5119b36d8.tar.gz kernel-qcow2-util-linux-5ac0b2699411acd952189f6532941bf5119b36d8.tar.xz kernel-qcow2-util-linux-5ac0b2699411acd952189f6532941bf5119b36d8.zip | |
Merge branch 'master' of https://github.com/pali/util-linux
* 'master' of https://github.com/pali/util-linux:
libblkid: udf: Fix reporting UDF 2.60 revision
Diffstat (limited to 'libblkid')
| -rw-r--r-- | libblkid/src/superblocks/udf.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c index bd8e0a5c2..97e79dab0 100644 --- a/libblkid/src/superblocks/udf.c +++ b/libblkid/src/superblocks/udf.c @@ -446,6 +446,16 @@ real_blksz: lvidiu_udf_rev = le16_to_cpu(lvidiu->min_udf_read_rev); if (lvidiu_udf_rev) udf_rev = lvidiu_udf_rev; + /* UDF-2.60: 2. Basic Restrictions & Requirements: + * The Minimum UDF Read Revision value shall be at most #0250 + * for all media with a UDF 2.60 file system. + * So in this case use Minimum UDF Write Revision as ID_FS_VERSION + * to distinguish between UDF 2.50 and UDF 2.60 discs. */ + if (lvidiu_udf_rev == 0x250) { + lvidiu_udf_rev = le16_to_cpu(lvidiu->min_udf_write_rev); + if (lvidiu_udf_rev > 0x250) + udf_rev = lvidiu_udf_rev; + } } } |