summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TEST4
-rw-r--r--module/zfs/zfs_ioctl.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/TEST b/TEST
index 05818faf7..eba35a37d 100644
--- a/TEST
+++ b/TEST
@@ -71,14 +71,10 @@ case "$BB_NAME" in
Amazon*)
;;
CentOS*)
- # Fails vnode:vn_rdwr, CentOS 6.
- TEST_SPLAT_SKIP="yes"
# Sporadic segmentation faults
TEST_ZTEST_SKIP="yes"
# Sporadic VERIFY(!zilog_is_dirty(zilog)) failed
TEST_ZILTEST_SKIP="yes"
- # Hangs loading modules
- TEST_ZCONFIG_SKIP="yes"
;;
Debian*)
;;
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 7ce19693e..d026e92d6 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -6011,7 +6011,7 @@ _init(void)
{
int error;
- error = vn_set_pwd("/");
+ error = -vn_set_pwd("/");
if (error) {
printk(KERN_NOTICE
"ZFS: Warning unable to set pwd to '/': %d\n", error);
@@ -6021,7 +6021,7 @@ _init(void)
spa_init(FREAD | FWRITE);
zfs_init();
- if ((error = zvol_init()) != 0)
+ if ((error = -zvol_init()) != 0)
goto out1;
zfs_ioctl_init();