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
Fix zfs.gentoo init script logic
[zfs.git]
/
lib
/
libzfs
/
libzfs_changelist.c
diff --git
a/lib/libzfs/libzfs_changelist.c
b/lib/libzfs/libzfs_changelist.c
index
6f067d5
..
0bcfc04
100644
(file)
--- a/
lib/libzfs/libzfs_changelist.c
+++ b/
lib/libzfs/libzfs_changelist.c
@@
-93,7
+93,6
@@
struct prop_changelist {
int
changelist_prefix(prop_changelist_t *clp)
{
int
changelist_prefix(prop_changelist_t *clp)
{
-#ifdef HAVE_ZPL
prop_changenode_t *cn;
int ret = 0;
prop_changenode_t *cn;
int ret = 0;
@@
-142,9
+141,6
@@
changelist_prefix(prop_changelist_t *clp)
(void) changelist_postfix(clp);
return (ret);
(void) changelist_postfix(clp);
return (ret);
-#else
- return 0;
-#endif /* HAVE_ZPL */
}
/*
}
/*
@@
-159,7
+155,6
@@
changelist_prefix(prop_changelist_t *clp)
int
changelist_postfix(prop_changelist_t *clp)
{
int
changelist_postfix(prop_changelist_t *clp)
{
-#ifdef HAVE_ZPL
prop_changenode_t *cn;
char shareopts[ZFS_MAXPROPLEN];
int errors = 0;
prop_changenode_t *cn;
char shareopts[ZFS_MAXPROPLEN];
int errors = 0;
@@
-260,9
+255,6
@@
changelist_postfix(prop_changelist_t *clp)
}
return (errors ? -1 : 0);
}
return (errors ? -1 : 0);
-#else
- return 0;
-#endif /* HAVE_ZPL */
}
/*
}
/*
@@
-325,7
+317,6
@@
changelist_rename(prop_changelist_t *clp, const char *src, const char *dst)
int
changelist_unshare(prop_changelist_t *clp, zfs_share_proto_t *proto)
{
int
changelist_unshare(prop_changelist_t *clp, zfs_share_proto_t *proto)
{
-#ifdef HAVE_ZPL
prop_changenode_t *cn;
int ret = 0;
prop_changenode_t *cn;
int ret = 0;
@@
-340,9
+331,6
@@
changelist_unshare(prop_changelist_t *clp, zfs_share_proto_t *proto)
}
return (ret);
}
return (ret);
-#else
- return 0;
-#endif
}
/*
}
/*