summaryrefslogtreecommitdiffstats
path: root/sys/geom/journal/g_journal.c
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2009-04-10 04:08:34 +0000
committerthompsa <thompsa@FreeBSD.org>2009-04-10 04:08:34 +0000
commit39714cb212e38a31abbdf01349fcc0211dd6f073 (patch)
tree706f3f29e2642dfa022bcec35abbf79ceff4a024 /sys/geom/journal/g_journal.c
parent9fcc70de74585cb50ad7e66252ee1d76b7fdce9a (diff)
downloadFreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.zip
FreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.tar.gz
Revert r190676,190677
The geom and CAM changes for root_hold are the wrong solution for USB design quirks. Requested by: scottl
Diffstat (limited to 'sys/geom/journal/g_journal.c')
-rw-r--r--sys/geom/journal/g_journal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index d3274a2..2db2364 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -2310,7 +2310,7 @@ g_journal_create(struct g_class *mp, struct g_provider *pp,
sc->sc_inactive.jj_queue = NULL;
sc->sc_active.jj_queue = NULL;
- sc->sc_rootmount = root_mount_hold("GJOURNAL", M_WAITOK);
+ sc->sc_rootmount = root_mount_hold("GJOURNAL");
GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount);
callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
OpenPOWER on IntegriCloud