apply post-1.14.2 patches

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

2 files changed, 5 insertions, 9 deletions

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 2666132f9..18512a395 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -624,7 +624,6 @@ static void setup_tables(void)
 int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
 {
-        struct mntent *mp;
         unsigned opt;
         char *tmp;
         struct stat statbuf;
@@ -683,11 +682,8 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
                 G.total_blocks = 65535;
 
         /* Check if it is mounted */
-        mp = find_mount_point(G.device_name, NULL);
-        if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
-                bb_error_msg_and_die("%s is mounted on %s; "
-                                "refusing to make a filesystem",
-                                G.device_name, mp->mnt_dir);
+        if (find_mount_point(G.device_name))
+                bb_error_msg_and_die("can't format mounted filesystem");
 
         xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
         if (fstat(dev_fd, &statbuf) < 0)
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 72c2058b5..aa6ae92db 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -273,10 +273,10 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
                         device_num == 0x0d00 || // xd
                         device_num == 0x1600 )  // hdc, hdd
                 )
-                        bb_error_msg_and_die("Will not try to make filesystem on full-disk device (use -I if wanted)");
+                        bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)");
                 // can't work on mounted filesystems
-                if (find_mount_point(device_name, NULL))
-                        bb_error_msg_and_die("Can't format mounted filesystem");
+                if (find_mount_point(device_name))
+                        bb_error_msg_and_die("can't format mounted filesystem");
 #endif
                 // get true sector size
                 // (parameter must be int*, not long* or size_t*)