[illumos-gate merge]

commit 4e0c5eff9af325c80994e9527b7cb8b3a1ffd1d4
    9268 cxgbe: this statement may fall through
commit 645a7badb6d38db4d4e2040b6e5ccfbcdf9e7f85
    9267 ufs: this statement may fall through

2 files changed, 17 insertions, 17 deletions

diff --git a/usr/src/uts/common/fs/ufs/ufs_panic.c b/usr/src/uts/common/fs/ufs/ufs_panic.c
index ced31d8a70..ffe52f3462 100644
--- a/usr/src/uts/common/fs/ufs/ufs_panic.c
+++ b/usr/src/uts/common/fs/ufs/ufs_panic.c
@@ -214,7 +214,7 @@ typedef struct uf_state_desc {
 
 /* thread to watch for failures */
 static void	ufsfx_thread_fix_failures(void *);
-static int 	ufsfx_do_failure_q(void);
+static int	ufsfx_do_failure_q(void);
 static void	ufsfx_kill_fix_failure_thread(void *);
 
 /* routines called when failure occurs */
@@ -251,13 +251,13 @@ static sfrc_t	sf_found_lock_fix_cmn(ufs_failure_t *, ufs_failure_states_t);
 static sfrc_t	sf_found_umount(ufs_failure_t *);
 
 /* support routines, called by sf_nonterm_cmn and sf_term_cmn */
-static time_t 	trylock_time_exceeded(ufs_failure_t *);
-static void 	pester_msg(ufs_failure_t *, int);
-static int 	get_lockfs_status(ufs_failure_t *, struct lockfs *);
-static void 	alloc_lockfs_comment(ufs_failure_t *, struct lockfs *);
-static int 	set_lockfs(ufs_failure_t *, struct lockfs *);
-static int 	lockfs_failure(ufs_failure_t *);
-static int 	lockfs_success(ufs_failure_t *);
+static time_t	trylock_time_exceeded(ufs_failure_t *);
+static void	pester_msg(ufs_failure_t *, int);
+static int	get_lockfs_status(ufs_failure_t *, struct lockfs *);
+static void	alloc_lockfs_comment(ufs_failure_t *, struct lockfs *);
+static int	set_lockfs(ufs_failure_t *, struct lockfs *);
+static int	lockfs_failure(ufs_failure_t *);
+static int	lockfs_success(ufs_failure_t *);
 static int	fsck_active(ufs_failure_t *);
 
 /* low-level support routines */
@@ -318,7 +318,7 @@ ufsd_t	state_desc[] =
 #if defined(DEBUG)
 					UF_PANIC |
 #endif /* DEBUG */
-					UF_TRYLCK | UF_LOCKED, 	{ 0, 0, 0 } },
+					UF_TRYLCK | UF_LOCKED,	{ 0, 0, 0 } },
 	{ UF_FIXING,	"being fixed",		sf_nonterm_cmn,
 						UF_LOCKED,	{ 0, 0, 0 } },
 	{ UF_FIXED,	"fixed",		sf_term_cmn,
@@ -336,7 +336,7 @@ ufsd_t	state_desc[] =
 	{ UF_PANIC,	"panicking",		sf_panic,
 		/* XXX make this narrower */	UF_ALLSTATES,	{ 0, 0, 0 } },
 	{ UF_UNDEF,	NULL,			((sfrc_t (*)()) NULL),
-						UF_UNDEF, 	{ 0, 0, 0 } }
+						UF_UNDEF,	{ 0, 0, 0 } }
 };
 
 /* unified collection */
@@ -370,7 +370,7 @@ struct error_description {
 	{ ERESTART,	"ERESTART"		},
 	{ ETIMEDOUT,	"ETIMEDOUT"		},
 	{ NO_ERROR,	"Ok"			},
-	{ EUNK,		NULL 			}
+	{ EUNK,		NULL			}
 };
 
 struct action_description act_desc[] =
@@ -492,12 +492,11 @@ ufs_fault_v(vnode_t *vp, char *fmt, va_list adx)
 		if (!(DEBUG_FLAGS & DBGFLG_FIXWOULDPANIC)) {
 			break;
 		}
-		/* FALLTHROUGH */
-
 #else
 		break;
 
 #endif /* DEBUG */
+		/* FALLTHROUGH */
 
 	case TRIAGE_ATTEND_TO:
 
@@ -2276,7 +2275,7 @@ lockfs_success(ufs_failure_t *f)
 		}
 		break;
 
-	case LOCKFS_ULOCK: 			/* unlock worked */
+	case LOCKFS_ULOCK:	/* unlock worked */
 		/*
 		 * how'd we get here?
 		 * This should be done from fsck's unlock,
diff --git a/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c b/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
index 2109c6fcf2..2c808a23fe 100644
--- a/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
+++ b/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
@@ -812,6 +812,7 @@ t4_ring_rx(struct sge_rxq *rxq, int budget)
 				panic("%s: line %d.", __func__,
 				    __LINE__);
 			}
+			/* FALLTHROUGH */
 
 		case X_RSPD_TYPE_CPL:
 			ASSERT(rss->opcode < NUM_CPL_CMDS);
@@ -1270,7 +1271,7 @@ init_eq(struct adapter *sc, struct sge_eq *eq, uint16_t eqtype, uint16_t qsize,
 		    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
 		s->s_qpp = r & M_QUEUESPERPAGEPF0;
 	}
- 
+
 	eq->flags = eqtype & EQ_TYPEMASK;
 	eq->tx_chan = tx_chan;
 	eq->iqid = iqid;
@@ -3106,7 +3107,7 @@ ring_tx_db(struct adapter *sc, struct sge_eq *eq)
 			*eq->udb = LE_32(V_QID(eq->udb_qid) | val);
 			break;
 
-		case DOORBELL_WCWR: 
+		case DOORBELL_WCWR:
 			{
 				volatile uint64_t *dst, *src;
 				int i;
@@ -3138,7 +3139,7 @@ ring_tx_db(struct adapter *sc, struct sge_eq *eq)
 			    V_QID(eq->cntxt_id) | val);
 			break;
 	}
- 
+
 	eq->pending = 0;
 }