aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libzpool
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-05-17 11:44:50 -0700
committerBrian Behlendorf <[email protected]>2016-05-17 11:52:07 -0700
commitada8258141f16da6647fd65aa8721d7ce2c02769 (patch)
treeae580f29d2d9c5dcc5a1fc6a091b5a07a999d5fe /lib/libzpool
parent2587cd8f93ec2ec774e49aafbf536b918f77cff2 (diff)
Revert "zhack: Add 'feature disable' command"
This reverts commit 83025286175d1ee1c29b842531070f3250a172ba and ebecfcd6991bebe71511cb8fd409112798f203b2 which broke the build. While these patches do apply cleanly and passed previous test runs they need to be updated to account for the changes made in commit 241b5415748859a3c272fc8f570f2368e93adde9. Signed-off-by: Brian Behlendorf <[email protected]> Issue #3878
Diffstat (limited to 'lib/libzpool')
-rw-r--r--lib/libzpool/kernel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index f14552374..89e474c65 100644
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -647,6 +647,8 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
#ifdef __linux__
flags |= O_DIRECT;
#endif
+ /* We shouldn't be writing to block devices in userspace */
+ VERIFY(!(flags & FWRITE));
}
if (flags & FCREAT)