shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

volume_id: move blocksize validation to fix jbd recognition

Browse Source 
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers 2005-10-23 18:54:34 +02:00
parent c929358e02
commit f3c14c6849
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extras/volume_id/volume_id/ext.c
View File

@ -86,13 +86,6 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off)
if (es->s_magic != cpu_to_le16(EXT_SUPER_MAGIC))
return -1;
bsize = 0x200 << le32_to_cpu(es->s_log_block_size);
dbg("ext blocksize 0x%zx", bsize);
if (bsize < EXT3_MIN_BLOCK_SIZE || bsize > EXT3_MAX_BLOCK_SIZE) {
dbg("invalid ext blocksize");
return -1;
}
volume_id_set_label_raw(id, es->s_volume_name, 16);
volume_id_set_label_string(id, es->s_volume_name, 16);
volume_id_set_uuid(id, es->s_uuid, UUID_DCE);
@ -106,6 +99,13 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off)
return 0;
}
bsize = 0x200 << le32_to_cpu(es->s_log_block_size);
dbg("ext blocksize 0x%zx", bsize);
if (bsize < EXT3_MIN_BLOCK_SIZE || bsize > EXT3_MAX_BLOCK_SIZE) {
dbg("invalid ext blocksize");
return -1;
}
/* check for ext2 / ext3 */
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
if ((le32_to_cpu(es->s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)