Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18370b36 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Ilya Dryomov
Browse files

ceph: mark expected switch fall-throughs 



In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
[idryomov@gmail.com: amended "Older OSDs" comment]
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 76bd6ec4

net/ceph/ceph_hash.c

+11 −1
Original line number Diff line number Diff line
@@ -47,28 +47,38 @@ unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length) 


	/* handle the last 11 bytes */

	c = c + length;

	switch (len) {            /* all the case statements fall through */

	switch (len) {

	case 11:

		c = c + ((__u32)k[10] << 24);

		/* fall through */

	case 10:

		c = c + ((__u32)k[9] << 16);

		/* fall through */

	case 9:

		c = c + ((__u32)k[8] << 8);

		/* the first byte of c is reserved for the length */

		/* fall through */

	case 8:

		b = b + ((__u32)k[7] << 24);

		/* fall through */

	case 7:

		b = b + ((__u32)k[6] << 16);

		/* fall through */

	case 6:

		b = b + ((__u32)k[5] << 8);

		/* fall through */

	case 5:

		b = b + k[4];

		/* fall through */

	case 4:

		a = a + ((__u32)k[3] << 24);

		/* fall through */

	case 3:

		a = a + ((__u32)k[2] << 16);

		/* fall through */

	case 2:

		a = a + ((__u32)k[1] << 8);

		/* fall through */

	case 1:

		a = a + k[0];

		/* case 0: nothing left to add */

net/ceph/messenger.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static void ceph_sock_state_change(struct sock *sk) 
	switch (sk->sk_state) {

	case TCP_CLOSE:

		dout("%s TCP_CLOSE\n", __func__);

		/* fall through */

	case TCP_CLOSE_WAIT:

		dout("%s TCP_CLOSE_WAIT\n", __func__);

		con_sock_state_closing(con);

net/ceph/mon_client.c

+3 −2
Original line number Diff line number Diff line
@@ -1280,8 +1280,9 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, 
		/*

		 * Older OSDs don't set reply tid even if the orignal

		 * request had a non-zero tid.  Work around this weirdness

		 * by falling through to the allocate case.

		 * by allocating a new message.

		 */

		/* fall through */

	case CEPH_MSG_MON_MAP:

	case CEPH_MSG_MDS_MAP:

	case CEPH_MSG_OSD_MAP: