aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/mount.h25
1 files changed, 19 insertions, 6 deletions
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index a3bc0518a7ea..f2ce078f2f81 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1023,23 +1023,36 @@ int vfs_mount_fetch_counter(struct mount *, enum mount_counter);
*zpcpu_get(mp->mnt_thread_in_ops_pcpu) == 1; \
})
-#define vfs_op_thread_enter(mp) ({ \
- bool _retval = true; \
- critical_enter(); \
+#define vfs_op_thread_enter_crit(mp) ({ \
+ bool _retval_crit = true; \
+ MPASS(curthread->td_critnest > 0); \
MPASS(!vfs_op_thread_entered(mp)); \
zpcpu_set_protected(mp->mnt_thread_in_ops_pcpu, 1); \
__compiler_membar(); \
if (__predict_false(mp->mnt_vfs_ops > 0)) { \
- vfs_op_thread_exit(mp); \
- _retval = false; \
+ vfs_op_thread_exit_crit(mp); \
+ _retval_crit = false; \
} \
+ _retval_crit; \
+})
+
+#define vfs_op_thread_enter(mp) ({ \
+ bool _retval; \
+ critical_enter(); \
+ _retval = vfs_op_thread_enter_crit(mp); \
+ if (__predict_false(!_retval)) \
+ critical_exit(); \
_retval; \
})
-#define vfs_op_thread_exit(mp) do { \
+#define vfs_op_thread_exit_crit(mp) do { \
MPASS(vfs_op_thread_entered(mp)); \
__compiler_membar(); \
zpcpu_set_protected(mp->mnt_thread_in_ops_pcpu, 0); \
+} while (0)
+
+#define vfs_op_thread_exit(mp) do { \
+ vfs_op_thread_exit_crit(mp); \
critical_exit(); \
} while (0)