From ada8258141f16da6647fd65aa8721d7ce2c02769 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 17 May 2016 11:44:50 -0700 Subject: 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 Issue #3878 --- lib/libzpool/kernel.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') 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) -- cgit v1.2.3