udf: Cleanup metadata flags handling

Use simple ->s_flags variable instead of u8 variable for each flag.

Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index b526f25c04c9d5d4ba75f5261456e2557ea4f162..d6caf01a20971e2e3237e885aa55f9ccd9998569 100644 (file)
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -323,10 +323,10 @@ uint32_t udf_get_pblock_meta25(struct super_block *sb, uint32_t block,
        retblk = udf_try_read_meta(inode, block, partition, offset);
        if (retblk == 0xFFFFFFFF && mdata->s_metadata_fe) {
                udf_warn(sb, "error reading from METADATA, trying to read from MIRROR\n");
-               if (!mdata->s_mirror_loaded_flag) {
+               if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) {
                        mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb,
                                mdata->s_mirror_file_loc, map->s_partition_num);
-                       mdata->s_mirror_loaded_flag = 1;
+                       mdata->s_flags |= MF_MIRROR_FE_LOADED;
                }
 
                inode = mdata->s_mirror_fe;

diff --git a/fs/udf/super.c b/fs/udf/super.c
index dfe043a36593dd5475d73e8d45c31ed596f98bef..e185253470dfa71725f4dc33ebc78463805908d9 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1333,8 +1333,8 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
                                        le32_to_cpu(mdm->allocUnitSize);
                                mdata->s_align_unit_size =
                                        le16_to_cpu(mdm->alignUnitSize);
-                               mdata->s_dup_md_flag     =
-                                       mdm->flags & 0x01;
+                               if (mdm->flags & 0x01)
+                                       mdata->s_flags |= MF_DUPLICATE_MD;
 
                                udf_debug("Metadata Ident suffix=0x%x\n",
                                          le16_to_cpu(*(__le16 *)
@@ -1349,8 +1349,8 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
                                          le32_to_cpu(mdm->metadataMirrorFileLoc));
                                udf_debug("Bitmap file loc=%d\n",
                                          le32_to_cpu(mdm->metadataBitmapFileLoc));
-                               udf_debug("Duplicate Flag: %d %d\n",
-                                         mdata->s_dup_md_flag, mdm->flags);
+                               udf_debug("Flags: %d %d\n",
+                                         mdata->s_flags, mdm->flags);
                        } else {
                                udf_debug("Unknown ident: %s\n",
                                          upm2->partIdent.ident);

diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index a3146b05feeb3cbca2d007e7a09eaff6b1884063..5142a82e32767339cece15bcf70e12928159591e 100644 (file)
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -54,14 +54,16 @@
 
 #pragma pack(1) /* XXX(hch): Why?  This file just defines in-core structures */
 
+#define MF_DUPLICATE_MD                0x01
+#define MF_MIRROR_FE_LOADED    0x02
+
 struct udf_meta_data {
        __u32   s_meta_file_loc;
        __u32   s_mirror_file_loc;
        __u32   s_bitmap_file_loc;
        __u32   s_alloc_unit_size;
        __u16   s_align_unit_size;
-       __u8    s_dup_md_flag;
-       __u8    s_mirror_loaded_flag;
+       int     s_flags;
        struct inode *s_metadata_fe;
        struct inode *s_mirror_fe;
        struct inode *s_bitmap_fe;