aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sys/kmem.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/include/sys/kmem.h b/include/sys/kmem.h
index 8d5e72937..d4b3bf680 100644
--- a/include/sys/kmem.h
+++ b/include/sys/kmem.h
@@ -78,14 +78,20 @@ typedef struct {
unsigned int saved_flags;
} fstrans_cookie_t;
+#ifdef PF_MEMALLOC_NOIO
+#define SPL_FSTRANS (PF_FSTRANS|PF_MEMALLOC_NOIO)
+#else
+#define SPL_FSTRANS (PF_FSTRANS)
+#endif
+
static inline fstrans_cookie_t
spl_fstrans_mark(void)
{
fstrans_cookie_t cookie;
cookie.fstrans_thread = current;
- cookie.saved_flags = current->flags & PF_FSTRANS;
- current->flags |= PF_FSTRANS;
+ cookie.saved_flags = current->flags & SPL_FSTRANS;
+ current->flags |= SPL_FSTRANS;
return (cookie);
}
@@ -94,9 +100,9 @@ static inline void
spl_fstrans_unmark(fstrans_cookie_t cookie)
{
ASSERT3P(cookie.fstrans_thread, ==, current);
- ASSERT(current->flags & PF_FSTRANS);
+ ASSERT((current->flags & SPL_FSTRANS) == SPL_FSTRANS);
- current->flags &= ~(PF_FSTRANS);
+ current->flags &= ~SPL_FSTRANS;
current->flags |= cookie.saved_flags;
}