summaryrefslogtreecommitdiffstats
path: root/module/zfs/zfs_ioctl.c
diff options
context:
space:
mode:
authorNed Bass <[email protected]>2010-10-29 15:27:03 -0700
committerBrian Behlendorf <[email protected]>2010-11-08 14:03:36 -0800
commit3ee56c292bbcd7e6b26e3c2ad8f0e50eee236bcc (patch)
tree82c915c8c96f26c68d67601c6a9a01b2ad149881 /module/zfs/zfs_ioctl.c
parent7e55f4e00cefd7bf5ff7753759c42c5af19ba710 (diff)
Make rollbacks fail gracefully
Support for rolling back datasets require a functional ZPL, which we currently do not have. The zfs command does not check for ZPL support before attempting a rollback, and in preparation for rolling back a zvol it removes the minor node of the device. To prevent the zvol device node from disappearing after a failed rollback operation, this change wraps the zfs_do_rollback() function in an #ifdef HAVE_ZPL and returns ENOSYS in the absence of a ZPL. This is consistent with the behavior of other ZPL dependent commands such as mount. The orginal error message observed with this bug was rather confusing: internal error: Unknown error 524 Aborted This was because zfs_ioc_rollback() returns ENOTSUP if we don't HAVE_ZPL, but Linux actually has no such error code. It should instead return EOPNOTSUPP, as that is how ENOTSUP is defined in user space. With that we would have gotten the somewhat more helpful message cannot rollback 'tank/fish': unsupported version This is rather a moot point with the above changes since we will no longer make that ioctl call without a ZPL. But, this change updates the error code just in case. Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
-rw-r--r--module/zfs/zfs_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 45e118e53..2856ba7c4 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3291,7 +3291,7 @@ out:
dsl_dataset_rele(ds, FTAG);
return (error);
#else
- return (ENOTSUP);
+ return (EOPNOTSUPP);
#endif /* HAVE_ZPL */
}