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
Improve the wording about hot spares
[zfs.git]
/
lib
/
libzfs
/
libzfs_diff.c
diff --git
a/lib/libzfs/libzfs_diff.c
b/lib/libzfs/libzfs_diff.c
index
5b3f934
..
8140a70
100644
(file)
--- a/
lib/libzfs/libzfs_diff.c
+++ b/
lib/libzfs/libzfs_diff.c
@@
-160,18
+160,22
@@
print_what(FILE *fp, mode_t what)
case S_IFDIR:
symbol = '/';
break;
case S_IFDIR:
symbol = '/';
break;
+#ifdef S_IFDOOR
case S_IFDOOR:
symbol = '>';
break;
case S_IFDOOR:
symbol = '>';
break;
+#endif
case S_IFIFO:
symbol = '|';
break;
case S_IFLNK:
symbol = '@';
break;
case S_IFIFO:
symbol = '|';
break;
case S_IFLNK:
symbol = '@';
break;
+#ifdef S_IFPORT
case S_IFPORT:
symbol = 'P';
break;
case S_IFPORT:
symbol = 'P';
break;
+#endif
case S_IFSOCK:
symbol = '=';
break;
case S_IFSOCK:
symbol = '=';
break;
@@
-726,7
+730,7
@@
setup_differ_info(zfs_handle_t *zhp, const char *fromsnap,
{
di->zhp = zhp;
{
di->zhp = zhp;
- di->cleanupfd = open(ZFS_DEV, O_RDWR
|O_EXCL
);
+ di->cleanupfd = open(ZFS_DEV, O_RDWR);
VERIFY(di->cleanupfd >= 0);
if (get_snapshot_names(di, fromsnap, tosnap) != 0)
VERIFY(di->cleanupfd >= 0);
if (get_snapshot_names(di, fromsnap, tosnap) != 0)