From 1ec9218faa2f0d11b66ec1eb9d202692b1eec2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Fri, 18 Mar 2022 18:40:13 +0100 Subject: [PATCH] libzfs: zfs_unshare: minor cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13165 --- lib/libzfs/libzfs_mount.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c index d007441f8..a2f1c982c 100644 --- a/lib/libzfs/libzfs_mount.c +++ b/lib/libzfs/libzfs_mount.c @@ -797,20 +797,15 @@ zfs_unshare(zfs_handle_t *zhp, const char *mountpoint, { libzfs_handle_t *hdl = zhp->zfs_hdl; struct mnttab entry; - const char *mntpt = NULL; if (proto == NULL) proto = share_all_proto; - /* check to see if need to unmount the filesystem */ - if (mountpoint != NULL) - mntpt = mountpoint; - if (mountpoint != NULL || ((zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) && libzfs_mnttab_find(hdl, zfs_get_name(zhp), &entry) == 0)) { - if (mountpoint == NULL) - mntpt = entry.mnt_mountp; + /* check to see if need to unmount the filesystem */ + const char *mntpt = mountpoint ?: entry.mnt_mountp; for (const enum sa_protocol *curr_proto = proto; *curr_proto != SA_NO_PROTOCOL; curr_proto++)