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

Commit 163e3cb7 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

net/rxrpc: Use BUG_ON 

if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@ disable unlikely @ expression E,f; @@

(
  if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)

@@ expression E,f; @@

(
  if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ff56607

net/rxrpc/ar-accept.c

+1 −2
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, 
						  false);

			spin_unlock(&call->lock);

			notification = NULL;

			if (ret < 0)

				BUG();

			BUG_ON(ret < 0);

		}

		spin_unlock(&call->conn->state_lock);

net/rxrpc/ar-ack.c

+1 −2
Original line number Diff line number Diff line
@@ -814,8 +814,7 @@ static int rxrpc_post_message(struct rxrpc_call *call, u32 mark, u32 error, 
		spin_lock_bh(&call->lock);

		ret = rxrpc_queue_rcv_skb(call, skb, true, fatal);

		spin_unlock_bh(&call->lock);

		if (ret < 0)

			BUG();

		BUG_ON(ret < 0);

	}



	return 0;