summaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2020-01-12 23:13:53 +0100
committerJan Kara <jack@suse.cz>2020-01-13 12:38:46 +0100
commit49be68c4931d9f0f171e5f01a574fc40205db2b5 (patch)
treeb165a3452f1b66c802cd5073311802eb5038fb46 /fs/udf
parentudf: Fix free space reporting for metadata and virtual partitions (diff)
downloadlinux-49be68c4931d9f0f171e5f01a574fc40205db2b5.tar.xz
linux-49be68c4931d9f0f171e5f01a574fc40205db2b5.zip
udf: Fix meaning of ENTITYID_FLAGS_* macros to be really bitwise-or flags
Currently ENTITYID_FLAGS_* macros definitions are written as hex numbers but their meaning is not bitwise-or flags. But rather bit position. This is unusual and could be misleading. So change meaning of ENTITYID_FLAGS_* macros definitions to be really bitwise-or flags. Link: https://lore.kernel.org/r/20200112221353.29711-1-pali.rohar@gmail.com Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/ecma_167.h4
-rw-r--r--fs/udf/super.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
index f9ee412fedc4..3fd85464abd5 100644
--- a/fs/udf/ecma_167.h
+++ b/fs/udf/ecma_167.h
@@ -95,8 +95,8 @@ struct regid {
} __packed;
/* Flags (ECMA 167r3 1/7.4.1) */
-#define ENTITYID_FLAGS_DIRTY 0x00
-#define ENTITYID_FLAGS_PROTECTED 0x01
+#define ENTITYID_FLAGS_DIRTY 0x01
+#define ENTITYID_FLAGS_PROTECTED 0x02
/* Volume Structure Descriptor (ECMA 167r3 2/9.1) */
#define VSD_STD_ID_LEN 5
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 5a4a6fb36819..0311c7decdd2 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -773,7 +773,7 @@ static int udf_verify_domain_identifier(struct super_block *sb,
udf_warn(sb, "Not OSTA UDF compliant %s descriptor.\n", dname);
goto force_ro;
}
- if (ident->flags & (1 << ENTITYID_FLAGS_DIRTY)) {
+ if (ident->flags & ENTITYID_FLAGS_DIRTY) {
udf_warn(sb, "Possibly not OSTA UDF compliant %s descriptor.\n",
dname);
goto force_ro;