udf: Do not mark possibly inconsistent filesystems as closed

If logical volume integrity descriptor contains non-closed integrity
type when mounting the volume, there are high chances that the volume is
not consistent (device was detached before the filesystem was
unmounted). Don't touch integrity type of such volume so that fsck can
recognize it and check such filesystem.

Reported-by: Pali Rohár <pali.rohar@gmail.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

2 files changed, 7 insertions, 2 deletions

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 2d4929fa884d..bf5f6084dcb2 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1988,7 +1988,10 @@ static void udf_open_lvid(struct super_block *sb)
         lvidiu->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
         ktime_get_real_ts(&ts);
         udf_time_to_disk_stamp(&lvid->recordingDateAndTime, ts);
-        lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN);
+        if (le32_to_cpu(lvid->integrityType) == LVID_INTEGRITY_TYPE_CLOSE)
+                lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN);
+        else
+                UDF_SET_FLAG(sb, UDF_FLAG_INCONSISTENT);
 
         lvid->descTag.descCRC = cpu_to_le16(
                 crc_itu_t(0, (char *)lvid + sizeof(struct tag),
@@ -2028,7 +2031,8 @@ static void udf_close_lvid(struct super_block *sb)
                 lvidiu->minUDFReadRev = cpu_to_le16(sbi->s_udfrev);
         if (sbi->s_udfrev > le16_to_cpu(lvidiu->minUDFWriteRev))
                 lvidiu->minUDFWriteRev = cpu_to_le16(sbi->s_udfrev);
-        lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE);
+        if (!UDF_QUERY_FLAG(sb, UDF_FLAG_INCONSISTENT))
+                lvid->integrityType = cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE);
 
         lvid->descTag.descCRC = cpu_to_le16(
                         crc_itu_t(0, (char *)lvid + sizeof(struct tag),
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 9dcb475fc74e..9dd3e1b9619e 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -29,6 +29,7 @@
 #define UDF_FLAG_SESSION_SET    15
 #define UDF_FLAG_LASTBLOCK_SET  16
 #define UDF_FLAG_BLOCKSIZE_SET  17
+#define UDF_FLAG_INCONSISTENT   18
 
 #define UDF_PART_FLAG_UNALLOC_BITMAP    0x0001
 #define UDF_PART_FLAG_UNALLOC_TABLE     0x0002