summaryrefslogtreecommitdiff
path: root/usr/src/cmd/format/checkdev.c
diff options
context:
space:
mode:
authorsjelinek <none@none>2005-12-13 10:24:52 -0800
committersjelinek <none@none>2005-12-13 10:24:52 -0800
commit82d71480b3c112fa91f04032225eda15dfe22e17 (patch)
tree4290edb7eb9dba70e31031466e202b8545c3fc50 /usr/src/cmd/format/checkdev.c
parent4ab75253616c6d68e967c10221bb663c0bfa99df (diff)
downloadillumos-joyent-82d71480b3c112fa91f04032225eda15dfe22e17.tar.gz
6349487 libdiskmgt should bypass all calls in dm_inuse when NOINUSE_CHECK is set
6359855 gcc still doesn't like cmd/fs.d/switchout.c 6354408 libdiskmgt needs to handle sysevent failures in miniroot or failsafe environments better 4896568 *mount* message for remounting read-only is bogus Contributed by Shawn Walker. 4995011 mountfs error timeout is 60ms instead of 60s Contributed by Jeremy Teo.
Diffstat (limited to 'usr/src/cmd/format/checkdev.c')
-rw-r--r--usr/src/cmd/format/checkdev.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/cmd/format/checkdev.c b/usr/src/cmd/format/checkdev.c
index 8310abe09c..2ed9774b13 100644
--- a/usr/src/cmd/format/checkdev.c
+++ b/usr/src/cmd/format/checkdev.c
@@ -284,6 +284,16 @@ checkdevinuse(char *cur_disk_path, diskaddr_t start, diskaddr_t end, int print,
char *name;
/*
+ * If the user does not want to do in use checking, return immediately.
+ * Normally, this is handled in libdiskmgt. For format, there is more
+ * processing required, so we want to bypass the in use checking
+ * here.
+ */
+
+ if (NOINUSE_SET)
+ return (0);
+
+ /*
* For format, we get basic 'in use' details from libdiskmgt. After
* that we must do the appropriate checking to see if the 'in use'
* details require a bit of additional work.