]>
Commit | Line | Data |
---|---|---|
cb6ed508 AF |
1 | diff -Naur udev-125.org/extras/volume_id/lib/ext.c udev-125/extras/volume_id/lib/ext.c |
2 | --- udev-125.org/extras/volume_id/lib/ext.c 2008-07-18 16:26:55.000000000 +0200 | |
3 | +++ udev-125/extras/volume_id/lib/ext.c 2012-06-25 00:52:40.976563010 +0200 | |
4 | @@ -160,32 +160,31 @@ | |
5 | goto found; | |
6 | } | |
7 | ||
8 | - /* has journal */ | |
9 | - if ((feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) { | |
10 | - /* "use on development code" is ext4dev */ | |
11 | - if ((flags & EXT2_FLAGS_TEST_FILESYS) != 0) { | |
12 | - id->type = "ext4dev"; | |
13 | - goto found; | |
14 | - } | |
15 | + /* "use on development code" is ext4dev */ | |
16 | + if ((flags & EXT2_FLAGS_TEST_FILESYS) != 0) { | |
17 | + id->type = "ext4dev"; | |
18 | + goto found; | |
19 | + } | |
20 | ||
21 | - /* incompatible ext3 features is ext4 */ | |
22 | - if ((feature_ro_compat & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) != 0 || | |
23 | - (feature_incompat & EXT3_FEATURE_INCOMPAT_UNSUPPORTED) != 0) { | |
24 | - id->type = "ext4"; | |
25 | - goto found; | |
26 | - } | |
27 | + /* incompatible ext3 features is ext4 */ | |
28 | + if ((feature_ro_compat & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) != 0 || | |
29 | + (feature_incompat & EXT3_FEATURE_INCOMPAT_UNSUPPORTED) != 0) { | |
30 | + id->type = "ext4"; | |
31 | + goto found; | |
32 | + } | |
33 | ||
34 | + /* has journal */ | |
35 | + if ((feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) { | |
36 | id->type = "ext3"; | |
37 | goto found; | |
38 | } else { | |
39 | - /* no incompatible ext2 feature is ext2 */ | |
40 | + /* no incompatible ext2 feature is ext2 */ | |
41 | if ((feature_ro_compat & EXT2_FEATURE_RO_COMPAT_UNSUPPORTED) == 0 && | |
42 | (feature_incompat & EXT2_FEATURE_INCOMPAT_UNSUPPORTED) == 0) { | |
43 | id->type = "ext2"; | |
44 | goto found; | |
45 | } | |
46 | } | |
47 | - | |
48 | return -1; | |
49 | ||
50 | found: |