From: Pali Rohár <pali.rohar@gmail.com>
Date: Sun, 12 Jan 2020 22:13:53 +0000 (+0100)
Subject: udf: Fix meaning of ENTITYID_FLAGS_* macros to be really bitwise-or flags
X-Git-Tag: v5.6-rc1~111^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49be68c4931d9f0f171e5f01a574fc40205db2b5;p=thirdparty%2Flinux.git

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>
---

diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
index f9ee412fedc45..3fd85464abd5f 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 5a4a6fb368194..0311c7decdd20 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;