diff options
author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2009-09-07 20:10:33 +0000 |
---|---|---|
committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2009-09-07 20:10:33 +0000 |
commit | 5d1b2674f83863d5f7f379fc4fc16f6090c34293 (patch) | |
tree | 1023f27bbbc257decb331e23ba827ee8257eec51 /cddl | |
parent | 343775c0b4cbe410a0575ad5af7a340d81d07902 (diff) | |
download | src-5d1b2674f83863d5f7f379fc4fc16f6090c34293.tar.gz src-5d1b2674f83863d5f7f379fc4fc16f6090c34293.zip |
Fix detection of file system being shared. After this change commands like:
# zfs unshare -a
# zfs destroy foo/bar
# zfs rename foo/bar foo/baz
should properly remove exported file systems.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=196950
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c index 84a8a576f99c..76ab7ac0d35f 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c @@ -172,6 +172,7 @@ is_shared(libzfs_handle_t *hdl, const char *mountpoint, zfs_share_proto_t proto) *tab = '\0'; if (strcmp(buf, mountpoint) == 0) { +#if defined(sun) /* * the protocol field is the third field * skip over second field @@ -194,6 +195,10 @@ is_shared(libzfs_handle_t *hdl, const char *mountpoint, zfs_share_proto_t proto) return (0); } } +#else + if (proto == PROTO_NFS) + return (SHARED_NFS); +#endif } } |