[illumos-gate merge]

commit e6301a35e2f110a678c6c67734f2d692a1c8a841
    8192 in.ndpd: misleading-indentation
commit be656d98a8733cd77d5106da969b7d5044b295c0
    8246 snoop(1m) clobbers status for the NFSv4 SETATTR operation
commit 795dfd20deca1239c237f91ce567b122866a30ac
    8234 rpcib: misleading-indentation
commit 2d2f193a21231a58c583466dc23ba71f1a25f424
    8166 zpool scrub thinks it repaired offline device

4 files changed, 22 insertions, 17 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/main.c b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/main.c
index 7752c02cf3..2bae04288e 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/main.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/main.c
@@ -1869,7 +1869,7 @@ check_if_removed(struct phyint *pi)
 			next_pr = pr->pr_next;
 			if (pr->pr_state & PR_AUTO)
 				prefix_update_ipadm_addrobj(pr, _B_FALSE);
-				prefix_delete(pr);
+			prefix_delete(pr);
 		}
 
 		/*
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c
index 70b95a5562..40a169e931 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c
@@ -2981,9 +2981,11 @@ static void
 sumres_setattr(char *buf, size_t buflen, void *obj)
 {
 	SETATTR4res *res = (SETATTR4res *)obj;
+	size_t len;
 
-	strncpy(buf, status_name(res->status), buflen);
-	sum_attr_bitmap(buf, buflen, &res->attrsset);
+	(void) snprintf(buf, buflen, "%s ", status_name(res->status));
+	len = strlen(buf);
+	sum_attr_bitmap(buf + len, buflen - len, &res->attrsset);
 }
 
 static void
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 890254ecb8..5452a9f2dd 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -1789,6 +1789,9 @@ vdev_dtl_should_excise(vdev_t *vd)
 	ASSERT0(scn->scn_phys.scn_errors);
 	ASSERT0(vd->vdev_children);
 
+	if (vd->vdev_state < VDEV_STATE_DEGRADED)
+		return (B_FALSE);
+
 	if (vd->vdev_resilver_txg == 0 ||
 	    range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0)
 		return (B_TRUE);
diff --git a/usr/src/uts/common/rpc/rpcib.c b/usr/src/uts/common/rpc/rpcib.c
index 07719f74fe..6908b95d4f 100644
--- a/usr/src/uts/common/rpc/rpcib.c
+++ b/usr/src/uts/common/rpc/rpcib.c
@@ -720,7 +720,7 @@ static rdma_stat rib_rm_conn(CONN *, rib_conn_list_t *);
  */
 static rdma_stat
 rib_create_cq(rib_hca_t *hca, uint32_t cq_size, ibt_cq_handler_t cq_handler,
-	rib_cq_t **cqp)
+    rib_cq_t **cqp)
 {
 	rib_cq_t	*cq;
 	ibt_cq_attr_t	cq_attr;
@@ -1460,7 +1460,7 @@ rib_attach_hca()
 /* ARGSUSED */
 static void
 rib_async_handler(void *clnt_private, ibt_hca_hdl_t hca_hdl,
-	ibt_async_code_t code, ibt_async_event_t *event)
+    ibt_async_code_t code, ibt_async_event_t *event)
 {
 	switch (code) {
 	case IBT_HCA_ATTACH_EVENT:
@@ -2057,7 +2057,7 @@ rib_disconnect_channel(CONN *conn, rib_conn_list_t *conn_list)
 		mutex_enter(&qp->send_rbufs_lock);
 		while (qp->n_send_rbufs)
 			cv_wait(&qp->send_rbufs_cv, &qp->send_rbufs_lock);
-			mutex_exit(&qp->send_rbufs_lock);
+		mutex_exit(&qp->send_rbufs_lock);
 
 		(void) ibt_free_channel(qp->qp_hdl);
 			qp->qp_hdl = NULL;
@@ -2303,7 +2303,7 @@ rib_rem_rep(rib_qp_t *qp, struct reply *rep)
  */
 rdma_stat
 rib_send_and_wait(CONN *conn, struct clist *cl, uint32_t msgid,
-	int send_sig, int cv_sig, caddr_t *swid)
+    int send_sig, int cv_sig, caddr_t *swid)
 {
 	struct send_wid	*wdesc;
 	struct clist	*clp;
@@ -2929,8 +2929,8 @@ rib_read(CONN *conn, struct clist *cl, int wait)
 /* ARGSUSED */
 static ibt_cm_status_t
 rib_srv_cm_handler(void *any, ibt_cm_event_t *event,
-	ibt_cm_return_args_t *ret_args, void *priv_data,
-	ibt_priv_data_len_t len)
+    ibt_cm_return_args_t *ret_args, void *priv_data,
+    ibt_priv_data_len_t len)
 {
 	queue_t		*q;
 	rib_qp_t	*qp;
@@ -3227,7 +3227,7 @@ rib_srv_cm_handler(void *any, ibt_cm_event_t *event,
 
 static rdma_stat
 rib_register_service(rib_hca_t *hca, int service_type,
-	uint8_t protocol_num, in_port_t dst_port)
+    uint8_t protocol_num, in_port_t dst_port)
 {
 	ibt_srv_desc_t		sdesc;
 	ibt_hca_portinfo_t	*port_infop;
@@ -3656,7 +3656,7 @@ rib_remreply(rib_qp_t *qp, struct reply *rep)
 
 rdma_stat
 rib_registermem(CONN *conn,  caddr_t adsp, caddr_t buf, uint_t buflen,
-	struct mrc *buf_handle)
+    struct mrc *buf_handle)
 {
 	ibt_mr_hdl_t	mr_hdl = NULL;	/* memory region handle */
 	ibt_mr_desc_t	mr_desc;	/* vaddr, lkey, rkey */
@@ -3681,8 +3681,8 @@ rib_registermem(CONN *conn,  caddr_t adsp, caddr_t buf, uint_t buflen,
 
 static rdma_stat
 rib_reg_mem(rib_hca_t *hca, caddr_t adsp, caddr_t buf, uint_t size,
-	ibt_mr_flags_t spec,
-	ibt_mr_hdl_t *mr_hdlp, ibt_mr_desc_t *mr_descp)
+    ibt_mr_flags_t spec,
+    ibt_mr_hdl_t *mr_hdlp, ibt_mr_desc_t *mr_descp)
 {
 	ibt_mr_attr_t	mem_attr;
 	ibt_status_t	ibt_status;
@@ -3711,7 +3711,7 @@ rib_reg_mem(rib_hca_t *hca, caddr_t adsp, caddr_t buf, uint_t size,
 
 rdma_stat
 rib_registermemsync(CONN *conn,  caddr_t adsp, caddr_t buf, uint_t buflen,
-	struct mrc *buf_handle, RIB_SYNCMEM_HANDLE *sync_handle, void *lrc)
+    struct mrc *buf_handle, RIB_SYNCMEM_HANDLE *sync_handle, void *lrc)
 {
 	ibt_mr_hdl_t	mr_hdl = NULL;	/* memory region handle */
 	rib_lrc_entry_t *l;
@@ -3780,7 +3780,7 @@ rib_deregistermem(CONN *conn, caddr_t buf, struct mrc buf_handle)
 /* ARGSUSED */
 rdma_stat
 rib_deregistermemsync(CONN *conn, caddr_t buf, struct mrc buf_handle,
-		RIB_SYNCMEM_HANDLE sync_handle, void *lrc)
+    RIB_SYNCMEM_HANDLE sync_handle, void *lrc)
 {
 	rib_lrc_entry_t *l;
 	l = (rib_lrc_entry_t *)lrc;
@@ -3796,7 +3796,7 @@ rib_deregistermemsync(CONN *conn, caddr_t buf, struct mrc buf_handle,
 /* ARGSUSED */
 rdma_stat
 rib_syncmem(CONN *conn, RIB_SYNCMEM_HANDLE shandle, caddr_t buf,
-		int len, int cpu)
+    int len, int cpu)
 {
 	ibt_status_t	status;
 	rib_hca_t *hca = (ctoqp(conn))->hca;
@@ -5189,7 +5189,7 @@ error_free:
 
 static rdma_stat
 rib_registermem_via_hca(rib_hca_t *hca, caddr_t adsp, caddr_t buf,
-	uint_t buflen, struct mrc *buf_handle)
+    uint_t buflen, struct mrc *buf_handle)
 {
 	ibt_mr_hdl_t	mr_hdl = NULL;	/* memory region handle */
 	ibt_mr_desc_t	mr_desc;	/* vaddr, lkey, rkey */