summaryrefslogtreecommitdiffstats
path: root/module/zcommon
diff options
context:
space:
mode:
authorGeorge Melikov <[email protected]>2017-02-08 01:02:27 +0300
committerBrian Behlendorf <[email protected]>2017-02-07 14:02:27 -0800
commit23d70cdef108005ecf4d862e0af01d08dabbc9c7 (patch)
tree8af0ff2442871fa26127476539d87579681490a3 /module/zcommon
parentbef78122e606945efbf2e08845e7d5e8ead93c3c (diff)
OpenZFS 6931 - lib/libzfs: cleanup gcc warnings
Authored by: Igor Kozhukhov <[email protected]> Reviewed by: Matthew Ahrens <[email protected]> Approved by: Robert Mustacchi <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Ported-by: George Melikov <[email protected]> OpenZFS-issue: https://www.illumos.org/issues/6931 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/88f61de Closes #5741
Diffstat (limited to 'module/zcommon')
-rw-r--r--module/zcommon/zfs_deleg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/module/zcommon/zfs_deleg.c b/module/zcommon/zfs_deleg.c
index 647a24e5f..ce659d7f5 100644
--- a/module/zcommon/zfs_deleg.c
+++ b/module/zcommon/zfs_deleg.c
@@ -22,6 +22,7 @@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright 2016 Igor Kozhukhov <[email protected]>
*/
#include <sys/zfs_context.h>
@@ -181,8 +182,9 @@ zfs_deleg_verify_nvlist(nvlist_t *nvp)
nvpair_name(perm_name));
if (error)
return (-1);
- } while ((perm_name = nvlist_next_nvpair(perms, perm_name)));
- } while ((who = nvlist_next_nvpair(nvp, who)));
+ } while ((perm_name = nvlist_next_nvpair(perms, perm_name))
+ != NULL);
+ } while ((who = nvlist_next_nvpair(nvp, who)) != NULL);
return (0);
}