32c32
< __FBSDID("$FreeBSD: head/sbin/hastd/primary.c 225786 2011-09-27 08:26:09Z pjd $");
---
> __FBSDID("$FreeBSD: head/sbin/hastd/primary.c 225830 2011-09-28 13:08:51Z pjd $");
298a299,309
> if (res->hr_metaflush == 1 && g_flush(res->hr_localfd) == -1) {
> if (errno == EOPNOTSUPP) {
> pjdlog_warning("The %s provider doesn't support flushing write cache. Disabling it.",
> res->hr_localpath);
> res->hr_metaflush = 0;
> } else {
> pjdlog_errno(LOG_ERR,
> "Unable to flush disk cache on activemap update");
> return (-1);
> }
> }
2001a2013
> nv_assert(nv, "metaflush");
2011a2024
> #define MODIFIED_METAFLUSH 0x80
2052a2066,2070
> vint = nv_get_int32(nv, "metaflush");
> if (gres->hr_metaflush != vint) {
> gres->hr_metaflush = vint;
> modified |= MODIFIED_METAFLUSH;
> }
2101a2120
> #undef MODIFIED_METAFLUSH