aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/mdconfig/mdconfig.81
-rw-r--r--sbin/mdconfig/mdconfig.c12
-rw-r--r--sys/dev/md/md.c6
3 files changed, 16 insertions, 3 deletions
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 28c17c5de9d0..0288474fec13 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -62,6 +62,7 @@
.Nm
.Fl d
.Fl u Ar unit
+.Op Fl o Oo Cm no Oc Ns Ar force
.Nm
.Fl l
.Op Fl n
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index d1abf6800fa3..107a25975097 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -58,7 +58,7 @@ usage()
"usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n"
" [-s size] [-S sectorsize] [-u unit]\n"
" [-x sectors/track] [-y heads/cyl]\n"
-" mdconfig -d -u unit\n"
+" mdconfig -d -u unit [-o [no]force]\n"
" mdconfig -l [-v] [-n] [-u unit]\n");
fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n");
fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n");
@@ -160,6 +160,16 @@ main(int argc, char **argv)
close(fd);
break;
case 'o':
+ if (action == DETACH) {
+ if (!strcmp(optarg, "force"))
+ mdio.md_options |= MD_FORCE;
+ else if (!strcmp(optarg, "noforce"))
+ mdio.md_options &= ~MD_FORCE;
+ else
+ errx(1, "Unknown option: %s.", optarg);
+ break;
+ }
+
if (cmdline != 2)
usage();
if (!strcmp(optarg, "async"))
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index bb9e64b201a4..99b18b186fb9 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -1133,13 +1133,15 @@ xmdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread
mdinit(sc);
return (0);
case MDIOCDETACH:
- if (mdio->md_mediasize != 0 || mdio->md_options != 0)
+ if (mdio->md_mediasize != 0 ||
+ (mdio->md_options & ~MD_FORCE) != 0)
return (EINVAL);
sc = mdfind(mdio->md_unit);
if (sc == NULL)
return (ENOENT);
- if (sc->opencount != 0 && !(sc->flags & MD_FORCE))
+ if (sc->opencount != 0 && !(sc->flags & MD_FORCE) &&
+ !(mdio->md_options & MD_FORCE))
return (EBUSY);
return (mddestroy(sc, td));
case MDIOCQUERY: