Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/busybox/patches/busybox-1.20.2-detect-ext4-too.patch

    Contents of /trunk/busybox/patches/busybox-1.20.2-detect-ext4-too.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1858 - (show annotations) (download)
    Thu Jul 26 09:45:43 2012 UTC (11 years, 9 months ago) by niro
    File size: 3474 byte(s) 
    added more upstream patches
    1 From 01339217261e3ad6f0a60c90e42e6d52580141ab Mon Sep 17 00:00:00 2001
    2 From: Denys Vlasenko <vda.linux@googlemail.com>
    3 Date: Fri, 18 May 2012 00:51:27 +0000
    4 Subject: volume_id/ext: detect ext4 too
    5
    6 function old new delta
    7 volume_id_probe_ext 108 132 +24
    8
    9 Signed-off-by: Dees Troy<dees_troy@teamw.in>
    10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
    11 ---
    12 diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
    13 index b5194a7..aa23d1e 100644
    14 --- a/util-linux/volume_id/ext.c
    15 +++ b/util-linux/volume_id/ext.c
    16 @@ -39,10 +39,50 @@ struct ext2_super_block {
    17 uint8_t volume_name[16];
    18 } PACKED;
    19
    20 -#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x00000004
    21 -#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008
    22 #define EXT_SUPERBLOCK_OFFSET 0x400
    23
    24 +/* for s_flags */
    25 +#define EXT2_FLAGS_TEST_FILESYS 0x0004
    26 +
    27 +/* for s_feature_compat */
    28 +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
    29 +
    30 +/* for s_feature_ro_compat */
    31 +#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
    32 +#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
    33 +#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
    34 +#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008
    35 +#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010
    36 +#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
    37 +#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
    38 +
    39 +/* for s_feature_incompat */
    40 +#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
    41 +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004
    42 +#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008
    43 +#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010
    44 +#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
    45 +#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
    46 +#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
    47 +#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
    48 +
    49 +#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
    50 + EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
    51 + EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
    52 +#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
    53 + EXT2_FEATURE_INCOMPAT_META_BG)
    54 +#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP
    55 +#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP
    56 +
    57 +#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
    58 + EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
    59 + EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
    60 +#define EXT3_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
    61 + EXT3_FEATURE_INCOMPAT_RECOVER| \
    62 + EXT2_FEATURE_INCOMPAT_META_BG)
    63 +#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED ~EXT3_FEATURE_INCOMPAT_SUPP
    64 +#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT3_FEATURE_RO_COMPAT_SUPP
    65 +
    66 int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
    67 {
    68 #define off ((uint64_t)0)
    69 @@ -66,11 +106,15 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
    70 dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
    71
    72 #if ENABLE_FEATURE_BLKID_TYPE
    73 - if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
    74 + if ((es->feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
    75 + || (es->feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
    76 + ) {
    77 + id->type = "ext4";
    78 + }
    79 + else if (es->feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
    80 id->type = "ext3";
    81 else
    82 id->type = "ext2";
    83 #endif
    84 -
    85 return 0;
    86 }
    87 --
    88 cgit v0.9.0.1-2-gef13