aboutsummaryrefslogtreecommitdiff
path: root/util-linux/mkfs_minix.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/mkfs_minix.c')
-rw-r--r--util-linux/mkfs_minix.c8
1 files changed, 2 insertions, 6 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)
624int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 624int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
625int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) 625int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
626{ 626{
627 struct mntent *mp;
628 unsigned opt; 627 unsigned opt;
629 char *tmp; 628 char *tmp;
630 struct stat statbuf; 629 struct stat statbuf;
@@ -683,11 +682,8 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
683 G.total_blocks = 65535; 682 G.total_blocks = 65535;
684 683
685 /* Check if it is mounted */ 684 /* Check if it is mounted */
686 mp = find_mount_point(G.device_name, NULL); 685 if (find_mount_point(G.device_name))
687 if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0) 686 bb_error_msg_and_die("can't format mounted filesystem");
688 bb_error_msg_and_die("%s is mounted on %s; "
689 "refusing to make a filesystem",
690 G.device_name, mp->mnt_dir);
691 687
692 xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); 688 xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
693 if (fstat(dev_fd, &statbuf) < 0) 689 if (fstat(dev_fd, &statbuf) < 0)