From: Tobin Harding <me@tobin.cc>
Date: Tue, 10 Oct 2017 23:41:47 +0000 (+1100)
Subject: Fix coverity defects: CID 147474
X-Git-Tag: zfs-0.8.0-rc1~525
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=523d5ce0f48a1b7127345d830e5a34079cace322;p=zfs

Fix coverity defects: CID 147474

CID 147474: Logically dead code (DEADCODE)

Remove ternary operator and return `error` directly.

Currently return value is derived from a ternary operator. The
conditional is always true. The ternary operator is therefore
redundant i.e dead code.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Closes #6723
---

diff --git a/module/zfs/sa.c b/module/zfs/sa.c
index 8046dbde2..f0a18bad8 100644
--- a/module/zfs/sa.c
+++ b/module/zfs/sa.c
@@ -980,7 +980,8 @@ bail:
 	kmem_free(sa->sa_user_table, count * sizeof (sa_attr_type_t));
 	sa->sa_user_table = NULL;
 	sa_free_attr_table(sa);
-	return ((error != 0) ? error : EINVAL);
+	ASSERT(error != 0);
+	return (error);
 }
 
 int