From: Marcel Huber <marcelhuberfoo@gmail.com>
Date: Wed, 11 May 2016 19:28:33 +0000 (+0200)
Subject: Fixes bug in fix_paths()
X-Git-Tag: zfs-0.7.0-rc1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20c901dc7a96a5f156d28bfb26d9f82026a4fcfb;p=zfs

Fixes bug in fix_paths()

Fixes bug introduced in commit 7d90f569a.  Hinted by gcc:

libzfs_import.c: In function ‘fix_paths’:
libzfs_import.c:602:28: warning: self-comparison always evaluates to true [-Wtautological-compare]
    if (best->ne_num_labels == best->ne_num_labels &&

Signed-off-by: Marcel Huber <marcelhuberfoo@gmail.com>
Signed-off-by: Chunwei Chen <tuxoko@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4632
---

diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index 25f369db9..99c3d9998 100644
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -599,7 +599,7 @@ fix_paths(nvlist_t *nv, name_entry_t *names)
 			}
 
 			/* Prefer paths earlier in the search order. */
-			if (best->ne_num_labels == best->ne_num_labels &&
+			if (ne->ne_num_labels == best->ne_num_labels &&
 			    ne->ne_order < best->ne_order) {
 				best = ne;
 				continue;