[illumos-gate merge]

commit 93d26c05275be2c44aedd16705237484fc0a0990
    13015 fruaccess: comparison between pointer and zero character constant
commit ba12489a763ade223e478c59fdc4cb752fcba568
    13011 tsalarm: '*' in boolean context, suggest '&&' instead
commit 09e6639baaf32231365cb9895bf1e0ea006a2a60
    12885 efcode: smatch and build errors
commit e4af2f17fac5babc25d094f1bf22dd06515f66c7
    13104 zfs: offset_t is signed and can not be > MAXOFFSET_T
commit 7aaede4825001926ae223b8c47ef9e4d0d6021ba
    12974 libc: left shift of negative value
commit 712669c9fa9278704a4ccefe1d96acaf29397d36
    13103 zfs: zvol_strategy() warn: unsigned 'off' is never less than zero
commit e075c017fe4c71cde62297bcc90d3411c0f4ad1d
    12512 dispadmin.1m manpage is missing \fB \fR around FX
commit 9b0881404678e5235132f9320785c3f5ce6e71f6
    13087 zfs: zfs_ereport_post() and zfs_ereport_start() return values are ignored
commit 5365b8a5984eca60a3cedc7f9f738e51fb056bec
    12936 bhyve vlapic needs ability to bypass isrvec_stk

1 files changed, 8 insertions, 11 deletions

diff --git a/usr/src/lib/efcode/fcdriver/phandle.c b/usr/src/lib/efcode/fcdriver/phandle.c
index 79a202da4e..fddca08ef0 100644
--- a/usr/src/lib/efcode/fcdriver/phandle.c
+++ b/usr/src/lib/efcode/fcdriver/phandle.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -78,13 +76,13 @@ convert_phandle(fcode_env_t *env, fstack_t d)
 
 	if (use_os_handle) {
 		my_nodeid_t nh;
-		nh.my_handle = (fc_phandle_t) d;
+		nh.my_handle = (fc_phandle_t)d;
 		t = find_resource(&cdp->nodeids, &nh, match_handle);
 		if (t == NULL) {
 			r = 0;
 		} else {
-			my_nodeid_t *p = (my_nodeid_t *) t->data;
-			r = (device_t *) p->node;
+			my_nodeid_t *p = (my_nodeid_t *)t->data;
+			r = (device_t *)p->node;
 		}
 	} else
 		r = (device_t *)d;
@@ -108,11 +106,11 @@ revert_phandle(fcode_env_t *env, device_t *d)
 		if (t == NULL) {
 			r = 0;
 		} else {
-			my_nodeid_t *p = (my_nodeid_t *) t->data;
-			r = (fstack_t) p->my_handle;
+			my_nodeid_t *p = (my_nodeid_t *)t->data;
+			r = (fstack_t)p->my_handle;
 		}
 	} else
-		r = (fstack_t) d;
+		r = (fstack_t)d;
 	return (r);
 }
 
@@ -135,7 +133,6 @@ allocate_phandle(fcode_env_t *env)
 {
 	private_data_t *pd;
 	common_data_t *cdp;
-	int error;
 	char *service;
 	device_t *current;
 	fc_cell_t hcell;
@@ -160,11 +157,11 @@ allocate_phandle(fcode_env_t *env)
 
 	pd = MALLOC(sizeof (private_data_t));
 	pd->common = cdp;
-	pd->parent = (fc_phandle_t) revert_phandle(env, current->parent);
+	pd->parent = (fc_phandle_t)revert_phandle(env, current->parent);
 	pd->upload = (cdp->init_done == 1);
 	current->private = pd;
 
-	error = fc_run_priv(cdp, service, 0, 1, &hcell);
+	(void) fc_run_priv(cdp, service, 0, 1, &hcell);
 
 	pd->node = fc_cell2phandle(hcell);