tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Jan Kara ed47a7d0 3080a74e

+10 -8
+2 -2
fs/udf/partition.c
··· 323 323 retblk = udf_try_read_meta(inode, block, partition, offset); 324 324 if (retblk == 0xFFFFFFFF && mdata->s_metadata_fe) { 325 325 udf_warn(sb, "error reading from METADATA, trying to read from MIRROR\n"); 326 - if (!mdata->s_mirror_loaded_flag) { 326 + if (!(mdata->s_flags & MF_MIRROR_FE_LOADED)) { 327 327 mdata->s_mirror_fe = udf_find_metadata_inode_efe(sb, 328 328 mdata->s_mirror_file_loc, map->s_partition_num); 329 - mdata->s_mirror_loaded_flag = 1; 329 + mdata->s_flags |= MF_MIRROR_FE_LOADED; 330 330 } 331 331 332 332 inode = mdata->s_mirror_fe;
+4 -4
fs/udf/super.c
··· 1333 1333 le32_to_cpu(mdm->allocUnitSize); 1334 1334 mdata->s_align_unit_size = 1335 1335 le16_to_cpu(mdm->alignUnitSize); 1336 - mdata->s_dup_md_flag = 1337 - mdm->flags & 0x01; 1336 + if (mdm->flags & 0x01) 1337 + mdata->s_flags |= MF_DUPLICATE_MD; 1338 1338 1339 1339 udf_debug("Metadata Ident suffix=0x%x\n", 1340 1340 le16_to_cpu(*(__le16 *) ··· 1349 1349 le32_to_cpu(mdm->metadataMirrorFileLoc)); 1350 1350 udf_debug("Bitmap file loc=%d\n", 1351 1351 le32_to_cpu(mdm->metadataBitmapFileLoc)); 1352 - udf_debug("Duplicate Flag: %d %d\n", 1353 - mdata->s_dup_md_flag, mdm->flags); 1352 + udf_debug("Flags: %d %d\n", 1353 + mdata->s_flags, mdm->flags); 1354 1354 } else { 1355 1355 udf_debug("Unknown ident: %s\n", 1356 1356 upm2->partIdent.ident);
+4 -2
fs/udf/udf_sb.h
··· 54 54 55 55 #pragma pack(1) /* XXX(hch): Why? This file just defines in-core structures */ 56 56 57 + #define MF_DUPLICATE_MD 0x01 58 + #define MF_MIRROR_FE_LOADED 0x02 59 + 57 60 struct udf_meta_data { 58 61 __u32 s_meta_file_loc; 59 62 __u32 s_mirror_file_loc; 60 63 __u32 s_bitmap_file_loc; 61 64 __u32 s_alloc_unit_size; 62 65 __u16 s_align_unit_size; 63 - __u8 s_dup_md_flag; 64 - __u8 s_mirror_loaded_flag; 66 + int s_flags; 65 67 struct inode *s_metadata_fe; 66 68 struct inode *s_mirror_fe; 67 69 struct inode *s_bitmap_fe;