Apply post-1.20.0 patches, bump version to 1.20.11_20_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 72 insertions, 21 deletions

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 0a34122b4..c4829a596 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -661,37 +661,45 @@ static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
 static void load_firmware(const char *firmware, const char *sysfs_path)
 {
         int cnt;
-        int firmware_fd, loading_fd, data_fd;
+        int firmware_fd, loading_fd;
 
         /* check for /lib/firmware/$FIRMWARE */
         xchdir("/lib/firmware");
-        firmware_fd = xopen(firmware, O_RDONLY);
-
-        /* in case we goto out ... */
-        data_fd = -1;
+        firmware_fd = open(firmware, O_RDONLY); /* can fail */
 
         /* check for /sys/$DEVPATH/loading ... give 30 seconds to appear */
         xchdir(sysfs_path);
         for (cnt = 0; cnt < 30; ++cnt) {
                 loading_fd = open("loading", O_WRONLY);
-                if (loading_fd != -1)
+                if (loading_fd >= 0)
                         goto loading;
                 sleep(1);
         }
         goto out;
 
  loading:
-        /* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
-        if (full_write(loading_fd, "1", 1) != 1)
-                goto out;
-
-        /* load firmware into /sys/$DEVPATH/data */
-        data_fd = open("data", O_WRONLY);
-        if (data_fd == -1)
-                goto out;
-        cnt = bb_copyfd_eof(firmware_fd, data_fd);
+        cnt = 0;
+        if (firmware_fd >= 0) {
+                int data_fd;
+
+                /* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
+                if (full_write(loading_fd, "1", 1) != 1)
+                        goto out;
+
+                /* load firmware into /sys/$DEVPATH/data */
+                data_fd = open("data", O_WRONLY);
+                if (data_fd < 0)
+                        goto out;
+                cnt = bb_copyfd_eof(firmware_fd, data_fd);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        close(data_fd);
+        }
 
-        /* tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading" */
+        /* Tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading"
+         * Note: we emit -1 if firmware file wasn't found.
+         * There are cases when otherwise kernel would wait for minutes
+         * before timing out.
+         */
         if (cnt > 0)
                 full_write(loading_fd, "0", 1);
         else
@@ -701,7 +709,6 @@ static void load_firmware(const char *firmware, const char *sysfs_path)
         if (ENABLE_FEATURE_CLEAN_UP) {
                 close(firmware_fd);
                 close(loading_fd);
-                close(data_fd);
         }
 }
 
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index b5194a7b5..aa23d1ebf 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -39,10 +39,50 @@ struct ext2_super_block {
         uint8_t volume_name[16];
 } PACKED;
 
-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x00000004
-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV       0x00000008
 #define EXT_SUPERBLOCK_OFFSET                   0x400
 
+/* for s_flags */
+#define EXT2_FLAGS_TEST_FILESYS                 0x0004
+
+/* for s_feature_compat */
+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x0004
+
+/* for s_feature_ro_compat */
+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE       0x0002
+#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR        0x0004
+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE        0x0008
+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM         0x0010
+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK        0x0020
+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE      0x0040
+
+/* for s_feature_incompat */
+#define EXT2_FEATURE_INCOMPAT_FILETYPE          0x0002
+#define EXT3_FEATURE_INCOMPAT_RECOVER           0x0004
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV       0x0008
+#define EXT2_FEATURE_INCOMPAT_META_BG           0x0010
+#define EXT4_FEATURE_INCOMPAT_EXTENTS           0x0040 /* extents support */
+#define EXT4_FEATURE_INCOMPAT_64BIT             0x0080
+#define EXT4_FEATURE_INCOMPAT_MMP               0x0100
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG           0x0200
+
+#define EXT2_FEATURE_RO_COMPAT_SUPP     (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+#define EXT2_FEATURE_INCOMPAT_SUPP      (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+                                         EXT2_FEATURE_INCOMPAT_META_BG)
+#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED       ~EXT2_FEATURE_INCOMPAT_SUPP
+#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED      ~EXT2_FEATURE_RO_COMPAT_SUPP
+
+#define EXT3_FEATURE_RO_COMPAT_SUPP     (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+#define EXT3_FEATURE_INCOMPAT_SUPP      (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+                                         EXT3_FEATURE_INCOMPAT_RECOVER| \
+                                         EXT2_FEATURE_INCOMPAT_META_BG)
+#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED       ~EXT3_FEATURE_INCOMPAT_SUPP
+#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED      ~EXT3_FEATURE_RO_COMPAT_SUPP
+
 int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
 {
 #define off ((uint64_t)0)
@@ -66,11 +106,15 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
         dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
 
 #if ENABLE_FEATURE_BLKID_TYPE
-        if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
+        if ((es->feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
+         || (es->feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
+        ) {
+                id->type = "ext4";
+        }
+        else if (es->feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
                 id->type = "ext3";
         else
                 id->type = "ext2";
 #endif
-
         return 0;
 }