git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add API to wait for pending commit callbacks
[zfs.git]
/
cmd
/
zfs
/
zfs_main.c
diff --git
a/cmd/zfs/zfs_main.c
b/cmd/zfs/zfs_main.c
index
b0e6180
..
5f22e43
100644
(file)
--- a/
cmd/zfs/zfs_main.c
+++ b/
cmd/zfs/zfs_main.c
@@
-2340,6
+2340,7
@@
typedef struct rollback_cbdata {
* 'cb_dependent' is set, then this is a dependent and we should report it
* without checking the transaction group.
*/
* 'cb_dependent' is set, then this is a dependent and we should report it
* without checking the transaction group.
*/
+#ifdef HAVE_ZPL
static int
rollback_check(zfs_handle_t *zhp, void *data)
{
static int
rollback_check(zfs_handle_t *zhp, void *data)
{
@@
-2399,10
+2400,12
@@
rollback_check(zfs_handle_t *zhp, void *data)
zfs_close(zhp);
return (0);
}
zfs_close(zhp);
return (0);
}
+#endif /* HAVE_ZPL */
static int
zfs_do_rollback(int argc, char **argv)
{
static int
zfs_do_rollback(int argc, char **argv)
{
+#ifdef HAVE_ZPL
int ret;
int c;
boolean_t force = B_FALSE;
int ret;
int c;
boolean_t force = B_FALSE;
@@
-2484,6
+2487,9
@@
out:
return (0);
else
return (1);
return (0);
else
return (1);
+#else
+ return ENOSYS;
+#endif /*HAVE_ZPL*/
}
/*
}
/*