diff options
| author |   marco <marco@openbsd.org> | 2007-06-01 18:50:56 +0000 |
|---|---|---|
| committer | marco <marco@openbsd.org> | 2007-06-01 18:50:56 +0000 |
| commit | 585d81f06d1775d9cdbb2fe613594ebc54e648a9 (patch) | |
| tree | 1796a4f6a20d33de90efb7147f398edd614ed768 /sys/dev/softraid.c | |
| parent | No need for tape fields to be daddr_t. int will do. (diff) | |
| download | wireguard-openbsd-585d81f06d1775d9cdbb2fe613594ebc54e648a9.tar.xz wireguard-openbsd-585d81f06d1775d9cdbb2fe613594ebc54e648a9.zip | |
Add additional flag to indicate that we have a metdadata io pending; this
way if we shut down the system we can make sure that it makes it onto disk
before scsibus detach.
ok dlg
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 1ea56541306..ff02511943f 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.66 2007/06/01 17:43:05 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.67 2007/06/01 18:50:56 marco Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -1362,7 +1362,7 @@ sr_shutdown_discipline(struct sr_discipline *sd) /* make sure there isn't a sync pending and yield */ wakeup(sd); - while (sd->sd_sync) + while (sd->sd_sync || sd->sd_must_flush) if (tsleep(&sd->sd_sync, MAXPRI, "sr_down", 60 * hz) == EWOULDBLOCK) break; @@ -2018,6 +2018,7 @@ die: sd->sd_vol.sv_chunks[c]->src_meta.scm_status = new_state; sd->sd_set_vol_state(sd); + sd->sd_must_flush = 1; workq_add_task(NULL, 0, sr_save_metadata_callback, sd, NULL); done: splx(s); @@ -2247,9 +2248,17 @@ sr_already_assembled(struct sr_discipline *sd) void sr_save_metadata_callback(void *arg1, void *arg2) { + struct sr_discipline *sd = arg1; + int s; + + s = splbio(); + if (sr_save_metadata(arg1, SR_VOL_DIRTY)) printf("%s: save metadata failed\n", - DEVNAME(((struct sr_discipline *)arg1)->sd_sc)); + DEVNAME(sd->sd_sc)); + + sd->sd_must_flush = 0; + splx(s); } int |